mask xy scale, mask boundary only overlay, fix 8 char mask nm bug, rework maskgui...

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

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-4.1.patch5 b/cinelerra-5.1/thirdparty/src/ffmpeg-4.1.patch5
deleted file mode 100644 (file)
index 9a53f7b..0000000
--- a/cinelerra-5.1/thirdparty/src/ffmpeg-4.1.patch5
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -u a/libavfilter/formats.c b/libavfilter/formats.c
---- a/libavfilter/formats.c    2018-11-02 18:17:29.000000000 -0600
-+++ b/libavfilter/formats.c    2019-04-09 14:12:01.659501027 -0600
-@@ -107,11 +107,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]);
-+            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 @@
-                     chroma1|= adesc->nb_components > 1;
-                 }
-             }
-+        }
-+    }
- 
-     // If chroma or alpha can be lost through merging then do not merge
-     if (alpha2 > alpha1 || chroma2 > chroma1)