X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2Fsrc%2Fx264.patch1;fp=cinelerra-5.1%2Fthirdparty%2Fsrc%2Fx264.patch1;h=9cd14f26f541a4237e131a1f7b06c242e305301d;hb=7c199a42936462d662ee405fe0b4df5ac74850dc;hp=0000000000000000000000000000000000000000;hpb=14c59195960203265f308a703e834e7c5f59f6d2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/thirdparty/src/x264.patch1 b/cinelerra-5.1/thirdparty/src/x264.patch1
new file mode 100644
index 00000000..9cd14f26
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/x264.patch1
@@ -0,0 +1,19 @@
+diff -ur a/encoder/encoder.c b/encoder/encoder.c
+--- a/encoder/encoder.c	2016-02-20 14:45:07.000000000 -0700
++++ b/encoder/encoder.c	2016-12-29 07:08:32.247434972 -0700
+@@ -614,6 +614,7 @@
+         return -1;
+     }
+ 
++#if 0
+     /* Detect default ffmpeg settings and terminate with an error. */
+     if( b_open )
+     {
+@@ -637,6 +638,7 @@
+             return -1;
+         }
+     }
++#endif
+ 
+     if( h->param.rc.i_rc_method < 0 || h->param.rc.i_rc_method > 2 )
+     {