summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/patch-ffmpeg-latm.patch6
-rw-r--r--contrib/version_ffmpeg.txt2
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