update ffmpeg git patches for version 7.0 + minor fixes

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

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0
index 32c876e1379991e69464b497ab49c836eee8747a..06435263773b161441383f06a3f00dd88f44c3c3 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0
@@ -1,11 +1,34 @@
-diff -urN a/fftools/cmdutils.c b/fftools/cmdutils.c
---- a/fftools/cmdutils.c       2019-12-02 08:48:02.860360597 -0700
-+++ b/fftools/cmdutils.c       2019-12-02 08:51:04.603975015 -0700
-@@ -1186,6 +1186,7 @@
+--- 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"
+ 
+ typedef float (*quantize_and_encode_band_func)(struct AACEncContext *s, PutBitContext *pb,
+
+--- 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
+@@ -36,6 +36,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;