X-Git-Url: http://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=0000000000000000000000000000000000000000;hp=06435263773b161441383f06a3f00dd88f44c3c3;hb=16c4c97c97ed7f44c9d225da316419597df634b3;hpb=798caac231e72a20e2bae0b86f8087bfe7f2c296 diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0 deleted file mode 100644 index 06435263..00000000 --- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0 +++ /dev/null @@ -1,34 +0,0 @@ ---- a/libavcodec/aaccoder.c -+++ b/libavcodec/aaccoder.c -@@ -60,6 +60,8 @@ - * replace low energy non zero bands */ - #define NOISE_LAMBDA_REPLACE 1.948f - -+#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) - { - x = (MUL16(x, x) + 4096) >> 13;