X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2Fsrc%2Fffmpeg.git.patch0;h=06435263773b161441383f06a3f00dd88f44c3c3;hb=77c806636b4a94f41c724e45208201eb926dd8ce;hp=7deb9356f8008f06362fdf3cc907f4938615daa9;hpb=2e9b85a9600790c491e3c4bf62bce17b195f91ae;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0
index 7deb9356..06435263 100644
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0
@@ -8,7 +8,8 @@
 +
  #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 @@
@@ -22,7 +23,7 @@
      { 1, 0, },
 --- a/libavcodec/opus_pvq.c
 +++ b/libavcodec/opus_pvq.c
-@@ -31,6 +31,8 @@
+@@ -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))