From 4a700442ef0cff37f4419faf5045caec59d8a126 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Mon, 23 Mar 2015 17:56:56 +0000 Subject: [PATCH] libav: bump to v11.3 git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7009 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/ffmpeg/A03-unbreak-no-tty.patch | 22 ------------- contrib/ffmpeg/A04-prores-padding.patch | 42 ------------------------- contrib/ffmpeg/module.defs | 2 +- 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 contrib/ffmpeg/A03-unbreak-no-tty.patch delete mode 100644 contrib/ffmpeg/A04-prores-padding.patch diff --git a/contrib/ffmpeg/A03-unbreak-no-tty.patch b/contrib/ffmpeg/A03-unbreak-no-tty.patch deleted file mode 100644 index 1e819bf9e..000000000 --- a/contrib/ffmpeg/A03-unbreak-no-tty.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit d995f0a1550c9148140eab34c7d770e90925c004 -Author: Luca Barbato -Date: Sat Sep 13 00:26:21 2014 +0200 - - log: Unbreak no-tty support on 256color terminals - -diff --git a/libavutil/log.c b/libavutil/log.c -index 5a8f293..d38e40b 100644 ---- a/libavutil/log.c -+++ b/libavutil/log.c -@@ -75,7 +75,8 @@ static void check_color_terminal(void) - char *term = getenv("TERM"); - use_color = !getenv("NO_COLOR") && !getenv("AV_LOG_FORCE_NOCOLOR") && - (getenv("TERM") && isatty(2) || getenv("AV_LOG_FORCE_COLOR")); -- use_color += term && strstr(term, "256color"); -+ if (use_color) -+ use_color += term && strstr(term, "256color"); - #else - use_color = getenv("AV_LOG_FORCE_COLOR") && !getenv("NO_COLOR") && - !getenv("AV_LOG_FORCE_NOCOLOR"); - - diff --git a/contrib/ffmpeg/A04-prores-padding.patch b/contrib/ffmpeg/A04-prores-padding.patch deleted file mode 100644 index 4ed24d0ba..000000000 --- a/contrib/ffmpeg/A04-prores-padding.patch +++ /dev/null @@ -1,42 +0,0 @@ -Subject: prores: Extend the padding check to 16bit -From: Luca Barbato -To: libav-devel@libav.org - -And use a self-explanatory macro instead of a simple number. - -CC: libav-stable@libav.org - ---- -libavcodec/proresdec.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c -index 4039f11..b2c2b28 100644 ---- a/libavcodec/proresdec.c -+++ b/libavcodec/proresdec.c -@@ -365,6 +365,7 @@ static inline void decode_dc_coeffs(GetBitContext *gb, int16_t *out, - } - } - -+#define MAX_PADDING 16 - - /** - * Decode AC coefficients for all blocks in a slice. -@@ -389,7 +390,7 @@ static inline int decode_ac_coeffs(GetBitContext *gb, int16_t *out, - lev_cb_index = ff_prores_lev_to_cb_index[FFMIN(level, 9)]; - - bits_left = get_bits_left(gb); -- if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left))) -+ if (bits_left <= 0 || (bits_left <= MAX_PADDING && !show_bits(gb, bits_left))) - return 0; - - run = decode_vlc_codeword(gb, ff_prores_ac_codebook[run_cb_index]); -@@ -397,7 +398,7 @@ static inline int decode_ac_coeffs(GetBitContext *gb, int16_t *out, - return AVERROR_INVALIDDATA; - - bits_left = get_bits_left(gb); -- if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left))) -+ if (bits_left <= 0 || (bits_left <= MAX_PADDING && !show_bits(gb, bits_left))) - return AVERROR_INVALIDDATA; - - level = decode_vlc_codeword(gb, ff_prores_ac_codebook[lev_cb_index]) + 1; diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 1ca9957c6..aba9652fa 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -6,7 +6,7 @@ endif $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__))) $(eval $(call import.CONTRIB.defs,FFMPEG)) -FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v11.2-0-g4039f11.tar.gz +FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v11.3-0-g00abc00.tar.gz FFMPEG.CONFIGURE.deps = FFMPEG.CONFIGURE.env = -- 2.40.0