X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2Fsrc%2Fffmpeg.git.patch0;fp=cinelerra-5.1%2Fthirdparty%2Fsrc%2Fffmpeg.git.patch0;h=7deb9356f8008f06362fdf3cc907f4938615daa9;hp=f976093573e5c85156a54764097ea9d9194e19be;hb=5f4783cf32ed1dd15dc023668284e95028080403;hpb=8a5c77cd787cd083c94a8f538dbbc0d548460646

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0
index f9760935..7deb9356 100644
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0
@@ -1,12 +1,33 @@
-diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
-index 88fdbeaf1e..f39d2e7cc4 100644
---- a/fftools/cmdutils.c
-+++ b/fftools/cmdutils.c
-@@ -1184,6 +1184,7 @@ static void print_buildconf(int flags, int level)
+--- a/libavcodec/aaccoder.c
++++ b/libavcodec/aaccoder.c
+@@ -60,6 +60,8 @@
+  * replace low energy non zero bands */
+ #define NOISE_LAMBDA_REPLACE 1.948f
  
- void show_banner(int argc, char **argv, const OptionDef *options)
++#undef B0
++
+ #include "libavcodec/aaccoder_trellis.h"
+ 
+ /**
+--- a/libavcodec/hevc_mvs.c
++++ b/libavcodec/hevc_mvs.c
+@@ -25,6 +25,8 @@
+ #include "hevcdec.h"
+ #include "threadframe.h"
+ 
++#undef B0
++
+ static const uint8_t l0_l1_cand_idx[12][2] = {
+     { 0, 1, },
+     { 1, 0, },
+--- a/libavcodec/opus_pvq.c
++++ b/libavcodec/opus_pvq.c
+@@ -31,6 +31,8 @@
+ #define CELT_PVQ_U(n, k) (ff_celt_pvq_u_row[FFMIN(n, k)][FFMAX(n, k)])
+ #define CELT_PVQ_V(n, k) (CELT_PVQ_U(n, k) + CELT_PVQ_U(n, (k) + 1))
+ 
++#undef B0
++
+ static inline int16_t celt_cos(int16_t x)
  {
-+    return;
-     int idx = locate_option(argc, argv, options, "version");
-     if (hide_banner || idx)
-         return;
+     x = (MUL16(x, x) + 4096) >> 13;