libav: bump to v11.3

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7009 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/ffmpeg/A03-unbreak-no-tty.patch b/contrib/ffmpeg/A03-unbreak-no-tty.patch
deleted file mode 100644 (file)
index 1e819bf..0000000
--- a/contrib/ffmpeg/A03-unbreak-no-tty.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit d995f0a1550c9148140eab34c7d770e90925c004
-Author: Luca Barbato <lu_zero@gentoo.org>
-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 (file)
index 4ed24d0..0000000
--- a/contrib/ffmpeg/A04-prores-padding.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Subject: prores: Extend the padding check to 16bit
-From: Luca Barbato <lu_zero@gentoo.org>
-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 1ca9957c602776e64003743db0dc291d9c4928d4..aba9652fa8e4e2fd7871505d121574c42ce56b3f 100644 (file)
--- 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   =