diff options
| author | eddyg <[email protected]> | 2008-09-29 22:00:39 +0000 |
|---|---|---|
| committer | eddyg <[email protected]> | 2008-09-29 22:00:39 +0000 |
| commit | 4e8e851f555b7f81d894739f4731f95f99435968 (patch) | |
| tree | b3a34734eb6609e0d1d5e063b6ae23aa1411cbb3 /contrib | |
| parent | 59ae524c2bfccb49200587ba924329aaf9523925 (diff) | |
Update ffmpeg from version r14737 to r15462.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1788 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/patch-ffmpeg-latm.patch | 6 | ||||
| -rw-r--r-- | contrib/version_ffmpeg.txt | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/contrib/patch-ffmpeg-latm.patch b/contrib/patch-ffmpeg-latm.patch index 6f7c925b8..5a5031864 100644 --- a/contrib/patch-ffmpeg-latm.patch +++ b/contrib/patch-ffmpeg-latm.patch @@ -806,10 +806,8 @@ Index: libavcodec/avcodec.h =================================================================== --- libavcodec/avcodec.h (revision 14016) +++ libavcodec/avcodec.h (working copy) -@@ -259,6 +259,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - CODEC_ID_MPEG4AAC, - #endif +@@ -259,4 +259,5 @@ + CODEC_ID_AAC, + CODEC_ID_AAC_LATM, CODEC_ID_AC3, CODEC_ID_DTS, diff --git a/contrib/version_ffmpeg.txt b/contrib/version_ffmpeg.txt index f7a55d4c6..043a665fa 100644 --- a/contrib/version_ffmpeg.txt +++ b/contrib/version_ffmpeg.txt @@ -1 +1 @@ -http://download.m0k.org/handbrake/contrib/ffmpeg-r14737.tar.gz +http://download.m0k.org/handbrake/contrib/ffmpeg-r15462.tar.gz |