Update ffmpeg to svn r15974, fixed up minor incompatiblities in the ffmpeg LATM diff...

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

diff --git a/contrib/Jamfile b/contrib/Jamfile
index d50a93472ba36c3515311150db47b8f89f5d6782..c6dd0e4fe75f14d49ccdc72a136b7fb38530a393 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -111,7 +111,7 @@ actions LibAvCodec
         --disable-shared --enable-static --disable-encoders \
         --enable-encoder=mpeg4 --enable-encoder=ac3 --enable-encoder=snow \
         --enable-libfaad --disable-ffmpeg --disable-ffserver \
-        --disable-muxers --enable-muxer=ipod --disable-bsfs \
+        --disable-muxers --enable-muxer=ipod --disable-bsfs --disable-vhook \
         --extra-cflags="-I$CONTRIB/include" \
         --extra-ldflags="-L$CONTRIB/lib" $(FFMPEG_EXTRA_OPTIONS) &&
     $(MAKE) && $(MAKE) install &&

diff --git a/contrib/patch-ffmpeg-latm.patch b/contrib/patch-ffmpeg-latm.patch
index 5a5031864e831374f11ead008c542af0a039934f..84cd6a85f5298b8180f22f45e70c11a75154a4ef 100644 (file)
--- a/contrib/patch-ffmpeg-latm.patch
+++ b/contrib/patch-ffmpeg-latm.patch
@@ -11,10 +11,10 @@ Index: libavcodec/Makefile
  OBJS-$(CONFIG_LIBGSM)                  += libgsm.o
  OBJS-$(CONFIG_LIBMP3LAME)              += libmp3lame.o
  OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o libschroedinger.o libdirac_libschro.o
-@@ -333,7 +333,7 @@
+@@ -350,7 +350,7 @@
  OBJS-$(CONFIG_LIBXVID)                 += libxvidff.o libxvid_rc.o
  
- 
+ # parsers
 -OBJS-$(CONFIG_AAC_PARSER)              += aac_parser.o aac_ac3_parser.o mpeg4audio.o
 +OBJS-$(CONFIG_AAC_PARSER)              += aac_parser.o aac_ac3_parser.o mpeg4audio.o latm_parser.o
  OBJS-$(CONFIG_AC3_PARSER)              += ac3_parser.o ac3tab.o aac_ac3_parser.o

diff --git a/contrib/version_ffmpeg.txt b/contrib/version_ffmpeg.txt
index 043a665fa0311cdd3e3e6f8d391615474b4e7bb1..8ca79d70271bdf571edbffdd025dfa59bd398f60 100644 (file)
--- a/contrib/version_ffmpeg.txt
+++ b/contrib/version_ffmpeg.txt
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/ffmpeg-r15462.tar.gz
+http://download.m0k.org/handbrake/contrib/ffmpeg-r15974.tar.gz