ffmpeg git patches for 6.0 updates

[goodguy/cinelerra.git] / cinelerra-5.1 / thirdparty / src / ffmpeg.git.patch3

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3
index d553a807e566f0e1b8ad1cd9788d26b4f0c05527..7edb2e24923e51a421580537133316b32d01a189 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3
@@ -1,6 +1,6 @@
 --- a/libavformat/avformat.h
 +++ b/libavformat/avformat.h
-@@ -499,6 +499,9 @@
+@@ -497,6 +497,9 @@
                                          The user or muxer can override this through
                                          AVFormatContext.avoid_negative_ts
                                          */
@@ -10,7 +10,7 @@
  
  #define AVFMT_SEEK_TO_PTS   0x4000000 /**< Seeking is based on PTS */
  
-@@ -670,7 +673,8 @@
+@@ -560,7 +563,8 @@
      /**
       * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
       * AVFMT_NOTIMESTAMPS, AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
@@ -22,7 +22,7 @@
 
 --- a/libavformat/dv.c
 +++ b/libavformat/dv.c
-@@ -640,6 +640,7 @@
+@@ -672,6 +672,7 @@
  const AVInputFormat ff_dv_demuxer = {
      .name           = "dv",
      .long_name      = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
@@ -32,7 +32,7 @@
      .read_header    = dv_read_header,
 --- a/libavformat/matroskadec.c
 +++ b/libavformat/matroskadec.c
-@@ -4427,6 +4427,7 @@
+@@ -4432,6 +4432,7 @@
  const AVInputFormat ff_webm_dash_manifest_demuxer = {
      .name           = "webm_dash_manifest",
      .long_name      = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
@@ -40,7 +40,7 @@
      .priv_class     = &webm_dash_class,
      .priv_data_size = sizeof(MatroskaDemuxContext),
      .flags_internal = FF_FMT_INIT_CLEANUP,
-@@ -4439,6 +4440,7 @@
+@@ -4444,6 +4445,7 @@
  const AVInputFormat ff_matroska_demuxer = {
      .name           = "matroska,webm",
      .long_name      = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
@@ -50,7 +50,7 @@
      .flags_internal = FF_FMT_INIT_CLEANUP,
 --- a/libavformat/seek.c
 +++ b/libavformat/seek.c
-@@ -600,6 +600,13 @@
+@@ -602,6 +602,13 @@
          return seek_frame_byte(s, stream_index, timestamp, flags);
      }