update ffmpeg.git files for newer versions

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

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch5 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch5
index 32e7fe11b3fb99ee271ab858b7f2f0757fb2a7ca..64ee262c9c7b0e9721fe48327374b01ea26554cb 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch5
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch5
@@ -1,29 +1,24 @@
-diff --git a/libavfilter/formats.c b/libavfilter/formats.c
-index de4315369d..f430908343 100644
 --- a/libavfilter/formats.c
 +++ b/libavfilter/formats.c
-@@ -107,11 +107,13 @@ AVFilterFormats *ff_merge_formats(AVFilterFormats *a, AVFilterFormats *b,
+@@ -110,11 +110,13 @@
         possibly causing a lossy conversion elsewhere in the graph.
         To avoid that, pretend that there are no common formats to force the
         insertion of a conversion filter. */
 -    if (type == AVMEDIA_TYPE_VIDEO)
--        for (i = 0; i < a->nb_formats; i++)
 +    if (type == AVMEDIA_TYPE_VIDEO) {
-+        for (i = 0; i < a->nb_formats; i++) {
-+            const AVPixFmtDescriptor *adesc = av_pix_fmt_desc_get(a->formats[i]);
+         for (i = 0; i < a->nb_formats; i++) {
+             const AVPixFmtDescriptor *const adesc = av_pix_fmt_desc_get(a->formats[i]);
 +            if( !adesc ) continue;
              for (j = 0; j < b->nb_formats; j++) {
--                const AVPixFmtDescriptor *adesc = av_pix_fmt_desc_get(a->formats[i]);
                  const AVPixFmtDescriptor *bdesc = av_pix_fmt_desc_get(b->formats[j]);
 +                if( !bdesc ) continue;
                  alpha2 |= adesc->flags & bdesc->flags & AV_PIX_FMT_FLAG_ALPHA;
                  chroma2|= adesc->nb_components > 1 && bdesc->nb_components > 1;
                  if (a->formats[i] == b->formats[j]) {
-@@ -119,6 +121,8 @@ AVFilterFormats *ff_merge_formats(AVFilterFormats *a, AVFilterFormats *b,
-                     chroma1|= adesc->nb_components > 1;
+@@ -123,6 +125,7 @@
                  }
              }
-+        }
+         }
 +    }
  
      // If chroma or alpha can be lost through merging then do not merge