From: Good Guy <good1.2guy@gmail.com>
Date: Mon, 3 Apr 2023 21:57:56 +0000 (-0600)
Subject: upgrade x264 to r3106 stable release
X-Git-Tag: 2023-04~3
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=90ad75e8fe9192de67c3273978dc3dd443e8c742;hp=28825bed18aa64daefcba4c4790f0c95beb46ff2;p=goodguy%2Fcinelerra.git

upgrade x264 to r3106 stable release
---

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 39a2d0c5..f9d2ab8a 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -417,7 +417,7 @@ PKG_3RD([twolame],[auto],
   [  libtwolame ])
 
 PKG_3RD([x264],[auto],
-  [x264-snapshot-20210615-master],
+  [x264-stable],
   [ libx264.a ],
   [ . ])
 
diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt
index c7ebc835..272f43a8 100644
--- a/cinelerra-5.1/thirdparty/downloads.txt
+++ b/cinelerra-5.1/thirdparty/downloads.txt
@@ -32,8 +32,7 @@ http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 https://sourceforge.net/projects/lame/files/latest/download?source=directory = 3.100
 https://download.osgeo.org/libtiff/tiff-4.5.0.tar.xz
 https://sourceforge.net/projects/libuuid/files/latest/download?source=directory - 1.0.3
-https://code.videolan.org/videolan/x264/-/tree/stable/x264-stable.tar.gz
-https://code.videolan.org/videolan/x264/-/tree/master/x264-snapshot-20210615-master.tar.xz (Andrew does somehow)
+https://code.videolan.org/videolan/x264/-/tree/stable/x264-stable.tar.gz (Jan. 2023 version r3106)
 https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz
 https://ffmpeg.org/releases/ffmpeg-5.1.tar.bz2
 https://github.com/webmproject/libvpx/archive/v1.13.0.tar.gz
diff --git a/cinelerra-5.1/thirdparty/src/264-stable.patch1 b/cinelerra-5.1/thirdparty/src/264-stable.patch1
new file mode 100644
index 00000000..08026a95
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/264-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/264-stable.tar.gz b/cinelerra-5.1/thirdparty/src/264-stable.tar.gz
new file mode 100644
index 00000000..45b8f4cf
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/264-stable.tar.gz differ