ffmpeg scan remap fix, configure.ac all or none fix, 3rd party libs: ffmpeg, turbo...

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

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch3 b/cinelerra-5.1/thirdparty/src/ffmpeg-4.3.patch3
similarity index 70%
rename from cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch3
rename to cinelerra-5.1/thirdparty/src/ffmpeg-4.3.patch3
index cd2843884679a287aab2f8e83db7a8d6ed7a24f0..e86894551a8a6da10f95e006525d0aeee888ec6d 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch3
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg-4.3.patch3
@@ -1,7 +1,7 @@
-diff -ru a/libavformat/avformat.h b/libavformat/avformat.h
---- a/libavformat/avformat.h   2019-08-05 14:52:21.000000000 -0600
-+++ b/libavformat/avformat.h   2019-08-08 17:26:45.869297510 -0600
-@@ -485,6 +485,9 @@
+diff -ruN a/libavformat/avformat.h b/libavformat/avformat.h
+--- a/libavformat/avformat.h   2020-06-15 12:54:24.000000000 -0600
++++ b/libavformat/avformat.h   2020-07-10 09:22:38.176711618 -0600
+@@ -480,6 +480,9 @@
                                          The user or muxer can override this through
                                          AVFormatContext.avoid_negative_ts
                                          */
@@ -11,7 +11,7 @@ diff -ru a/libavformat/avformat.h b/libavformat/avformat.h
  
  #define AVFMT_SEEK_TO_PTS   0x4000000 /**< Seeking is based on PTS */
  
-@@ -654,7 +657,8 @@
+@@ -650,7 +653,8 @@
      /**
       * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
       * AVFMT_NOTIMESTAMPS, AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
@@ -21,12 +21,10 @@ diff -ru a/libavformat/avformat.h b/libavformat/avformat.h
       */
      int flags;
  
-Only in b/libavformat: avformat.h.orig
-Only in b/libavformat: avformat.h.rej
-diff -ru a/libavformat/dv.c b/libavformat/dv.c
---- a/libavformat/dv.c 2019-08-05 14:52:21.000000000 -0600
-+++ b/libavformat/dv.c 2019-08-08 17:23:57.558692650 -0600
-@@ -632,6 +632,7 @@
+diff -ruN a/libavformat/dv.c b/libavformat/dv.c
+--- a/libavformat/dv.c 2020-06-15 12:54:24.000000000 -0600
++++ b/libavformat/dv.c 2020-07-10 09:22:38.177711618 -0600
+@@ -642,6 +642,7 @@
  AVInputFormat ff_dv_demuxer = {
      .name           = "dv",
      .long_name      = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
@@ -34,10 +32,10 @@ diff -ru a/libavformat/dv.c b/libavformat/dv.c
      .priv_data_size = sizeof(RawDVContext),
      .read_probe     = dv_probe,
      .read_header    = dv_read_header,
-diff -ru a/libavformat/matroskadec.c b/libavformat/matroskadec.c
---- a/libavformat/matroskadec.c        2019-08-05 14:52:21.000000000 -0600
-+++ b/libavformat/matroskadec.c        2019-08-08 17:23:57.559692582 -0600
-@@ -4229,6 +4229,7 @@
+diff -ruN a/libavformat/matroskadec.c b/libavformat/matroskadec.c
+--- a/libavformat/matroskadec.c        2020-06-15 12:54:24.000000000 -0600
++++ b/libavformat/matroskadec.c        2020-07-10 09:22:38.178711618 -0600
+@@ -4251,6 +4251,7 @@
  AVInputFormat ff_matroska_demuxer = {
      .name           = "matroska,webm",
      .long_name      = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
@@ -45,7 +43,7 @@ diff -ru a/libavformat/matroskadec.c b/libavformat/matroskadec.c
      .extensions     = "mkv,mk3d,mka,mks",
      .priv_data_size = sizeof(MatroskaDemuxContext),
      .read_probe     = matroska_probe,
-@@ -4242,6 +4243,7 @@
+@@ -4264,6 +4265,7 @@
  AVInputFormat ff_webm_dash_manifest_demuxer = {
      .name           = "webm_dash_manifest",
      .long_name      = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
@@ -53,11 +51,10 @@ diff -ru a/libavformat/matroskadec.c b/libavformat/matroskadec.c
      .priv_data_size = sizeof(MatroskaDemuxContext),
      .read_header    = webm_dash_manifest_read_header,
      .read_packet    = webm_dash_manifest_read_packet,
-Only in b/libavformat: matroskadec.c.orig
-diff -ru a/libavformat/utils.c b/libavformat/utils.c
---- a/libavformat/utils.c      2019-08-05 14:52:21.000000000 -0600
-+++ b/libavformat/utils.c      2019-08-08 17:23:57.560692514 -0600
-@@ -2472,6 +2472,13 @@
+diff -ruN a/libavformat/utils.c b/libavformat/utils.c
+--- a/libavformat/utils.c      2020-06-15 12:54:24.000000000 -0600
++++ b/libavformat/utils.c      2020-07-10 09:22:38.179711619 -0600
+@@ -2486,6 +2486,13 @@
          return seek_frame_byte(s, stream_index, timestamp, flags);
      }