diff options
| author | eddyg <[email protected]> | 2008-12-01 21:40:15 +0000 |
|---|---|---|
| committer | eddyg <[email protected]> | 2008-12-01 21:40:15 +0000 |
| commit | f7d18cffb33823b66bc44e9cb0f8c211d4b869d4 (patch) | |
| tree | b4a67d2feabdf6b32c9d0f249dd872bb98faf72d | |
| parent | 829846d4d6810b2b1b90460e01cc84ecb6bf9590 (diff) | |
Update ffmpeg to svn r15974, fixed up minor incompatiblities in the ffmpeg LATM diff context.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1983 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/Jamfile | 2 | ||||
| -rw-r--r-- | contrib/patch-ffmpeg-latm.patch | 4 | ||||
| -rw-r--r-- | contrib/version_ffmpeg.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile index d50a93472..c6dd0e4fe 100644 --- 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 5a5031864..84cd6a85f 100644 --- 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 043a665fa..8ca79d702 100644 --- 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 |