From: Good Guy <good1.2guy@gmail.com>
Date: Tue, 4 Apr 2023 16:00:42 +0000 (-0600)
Subject: bandaged fingers naming mistake for x264
X-Git-Tag: 2023-04~2
X-Git-Url: https://git.cinelerra-gg.org/?a=commitdiff_plain;h=a6455eee4cdbe85aec98b3b6bad24694da7e8c5a;p=goodguy%2Fcinelerra.git

bandaged fingers naming mistake for x264
---

diff --git a/cinelerra-5.1/thirdparty/src/264-stable.patch1 b/cinelerra-5.1/thirdparty/src/264-stable.patch1
deleted file mode 100644
index 08026a95..00000000
--- a/cinelerra-5.1/thirdparty/src/264-stable.patch1
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/encoder/encoder.c	2023-04-01 19:08:58.420132123 -0600
-+++ b/encoder/encoder.c	2023-04-01 18:52:48.148808059 -0600
-@@ -667,6 +667,7 @@
-         return -1;
-     }
- 
-+#if 0
-     /* Detect default ffmpeg settings and terminate with an error. */
-     if( b_open )
-     {
-@@ -690,6 +691,7 @@
-             return -1;
-         }
-     }
-+#endif
- 
-     if( h->param.rc.i_rc_method < 0 || h->param.rc.i_rc_method > 2 )
-     {
diff --git a/cinelerra-5.1/thirdparty/src/264-stable.tar.gz b/cinelerra-5.1/thirdparty/src/264-stable.tar.gz
deleted file mode 100644
index 45b8f4cf..00000000
Binary files a/cinelerra-5.1/thirdparty/src/264-stable.tar.gz and /dev/null differ
diff --git a/cinelerra-5.1/thirdparty/src/x264-stable.patch1 b/cinelerra-5.1/thirdparty/src/x264-stable.patch1
new file mode 100644
index 00000000..08026a95
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/x264-stable.patch1
@@ -0,0 +1,18 @@
+--- a/encoder/encoder.c	2023-04-01 19:08:58.420132123 -0600
++++ b/encoder/encoder.c	2023-04-01 18:52:48.148808059 -0600
+@@ -667,6 +667,7 @@
+         return -1;
+     }
+ 
++#if 0
+     /* Detect default ffmpeg settings and terminate with an error. */
+     if( b_open )
+     {
+@@ -690,6 +691,7 @@
+             return -1;
+         }
+     }
++#endif
+ 
+     if( h->param.rc.i_rc_method < 0 || h->param.rc.i_rc_method > 2 )
+     {
diff --git a/cinelerra-5.1/thirdparty/src/x264-stable.tar.gz b/cinelerra-5.1/thirdparty/src/x264-stable.tar.gz
new file mode 100644
index 00000000..45b8f4cf
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/x264-stable.tar.gz differ