diff options
| author | Rodeo <[email protected]> | 2013-05-13 00:49:46 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-05-13 00:49:46 +0000 |
| commit | 440e227cc4cddbb0461391b2a0d56d94b75f1c31 (patch) | |
| tree | 8563c3b58811cd5a0d279b4969f6b480061fd816 /contrib/ffmpeg | |
| parent | 54548c1b81b719aba1810b9b21526fced9a675ce (diff) | |
Bump Libav to v9.6.
Miscellaneous security and bug fixes, including support for mixed interlaced/non-interlaced ProRes video.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5454 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg')
| -rw-r--r-- | contrib/ffmpeg/A01-h264-recovery-point.patch | 4 | ||||
| -rw-r--r-- | contrib/ffmpeg/P01-solaris.patch | 4 | ||||
| -rw-r--r-- | contrib/ffmpeg/P02-darwin-pic.patch | 6 | ||||
| -rw-r--r-- | contrib/ffmpeg/module.defs | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/contrib/ffmpeg/A01-h264-recovery-point.patch b/contrib/ffmpeg/A01-h264-recovery-point.patch index b9c29dc3a..353f18e9f 100644 --- a/contrib/ffmpeg/A01-h264-recovery-point.patch +++ b/contrib/ffmpeg/A01-h264-recovery-point.patch @@ -1,5 +1,5 @@ diff --git a/libavcodec/h264.c b/libavcodec/h264.c -index 54f6186..2647d5d 100644 +index 8625b0f..e862701 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2164,6 +2164,7 @@ static void flush_dpb(AVCodecContext *avctx) @@ -10,7 +10,7 @@ index 54f6186..2647d5d 100644 } static int init_poc(H264Context *h) -@@ -3995,9 +3996,18 @@ again: +@@ -4001,9 +4002,18 @@ again: if ((err = decode_slice_header(hx, h))) break; diff --git a/contrib/ffmpeg/P01-solaris.patch b/contrib/ffmpeg/P01-solaris.patch index 29633e323..399aabc3a 100644 --- a/contrib/ffmpeg/P01-solaris.patch +++ b/contrib/ffmpeg/P01-solaris.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index aa31ea0..773e6bf 100755 +index 6ab04ae..1c8ab46 100755 --- a/configure +++ b/configure -@@ -3167,7 +3167,7 @@ EOF +@@ -3171,7 +3171,7 @@ EOF check_cc <<EOF || die "endian test failed" unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E'; EOF diff --git a/contrib/ffmpeg/P02-darwin-pic.patch b/contrib/ffmpeg/P02-darwin-pic.patch index b3f883eae..f512416a1 100644 --- a/contrib/ffmpeg/P02-darwin-pic.patch +++ b/contrib/ffmpeg/P02-darwin-pic.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index aa31ea0..a7f5380 100755 +index 6ab04ae..fa9f980 100755 --- a/configure +++ b/configure -@@ -2889,6 +2889,7 @@ case $target_os in +@@ -2893,6 +2893,7 @@ case $target_os in AVSERVERLDFLAGS=-Wl,-bind_at_load objformat="macho" enabled x86_64 && objformat="macho64" @@ -10,7 +10,7 @@ index aa31ea0..a7f5380 100755 enabled_any pic shared || { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; } ;; -@@ -3091,7 +3092,7 @@ esc(){ +@@ -3095,7 +3096,7 @@ esc(){ echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIGURATION)" >config.fate diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 7e245d8e5..f906631cc 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,7 +1,7 @@ $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB FDKAAC)) $(eval $(call import.CONTRIB.defs,FFMPEG)) -FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v9.3.tar.bz2 +FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v9.6.tar.bz2 FFMPEG.CONFIGURE.deps = FFMPEG.CONFIGURE.env = |