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.patch4

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch4 b/cinelerra-5.1/thirdparty/src/ffmpeg-4.3.patch4
similarity index 76%
rename from cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch4
rename to cinelerra-5.1/thirdparty/src/ffmpeg-4.3.patch4
index 87a2d41bf64a585b2ab88416775d7ce368ebe01b..681dd8225dd75a4c2c481f58ad1281fbdbf3351e 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch4
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg-4.3.patch4
@@ -1,7 +1,7 @@
-diff -ru a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
---- a/libavfilter/af_aformat.c 2018-07-17 03:27:41.000000000 -0600
-+++ b/libavfilter/af_aformat.c 2019-08-08 18:20:22.150540943 -0600
-@@ -109,6 +109,16 @@
+diff -ruN a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
+--- a/libavfilter/af_aformat.c 2020-06-15 12:54:24.000000000 -0600
++++ b/libavfilter/af_aformat.c 2020-07-10 09:24:01.659724729 -0600
+@@ -112,6 +112,16 @@
      return 0;
  }
  
@@ -18,7 +18,7 @@ diff -ru a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
  static int query_formats(AVFilterContext *ctx)
  {
      AFormatContext *s = ctx->priv;
-@@ -146,6 +156,7 @@
+@@ -149,6 +159,7 @@
      .name          = "aformat",
      .description   = NULL_IF_CONFIG_SMALL("Convert the input audio to one of the specified formats."),
      .init          = init,