From 8296b674632d07820bdf2f62e8dc368afbe1d683 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Sun, 27 Feb 2011 18:41:24 +0000 Subject: [PATCH] bump ffmpeg from git-185a155 to git-0b32da9 fixes win64 crash git-svn-id: svn://localhost/HandBrake/trunk@3818 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/ffmpeg/module.defs | 2 +- gtk/src/Makefile.am | 4 ++-- libhb/module.defs | 2 +- libhb/stream.c | 2 +- macosx/HandBrake.xcodeproj/project.pbxproj | 20 -------------------- test/module.defs | 2 +- 6 files changed, 6 insertions(+), 26 deletions(-) diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index b739baee..40c32003 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,7 +1,7 @@ $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,BZIP2 ZLIB)) $(eval $(call import.CONTRIB.defs,FFMPEG)) -FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/ffmpeg-git-185a155.tar.bz2 +FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/ffmpeg-git-0b32da9.tar.bz2 FFMPEG.CONFIGURE.deps = FFMPEG.CONFIGURE.env = diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am index b07dc915..9c1dbd2c 100644 --- a/gtk/src/Makefile.am +++ b/gtk/src/Makefile.am @@ -2,13 +2,13 @@ if MINGW HB_LIBS= \ - -lhb -la52 -lmkv -lavformat -lavcodec -lavcore -lavutil -ldca -ldvdnav -ldvdread \ + -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \ -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \ -lx264 -lmp4v2 -lswscale -ltheora -lz \ -lbz2 -liberty -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype else HB_LIBS= \ - -lhb -la52 -lmkv -lavformat -lavcodec -lavcore -lavutil -ldca -ldvdnav -ldvdread \ + -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \ -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \ -lx264 -lmp4v2 -lswscale -ltheora -lz \ -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype diff --git a/libhb/module.defs b/libhb/module.defs index 12db981e..add88438 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -92,7 +92,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll LIBHB.lib = $(LIBHB.build/)hb.lib LIBHB.dll.libs = $(foreach n, \ - a52 ass avcore avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \ + a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \ ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \ $(CONTRIB.build/)lib/lib$(n).a ) diff --git a/libhb/stream.c b/libhb/stream.c index 183f8693..4c118411 100644 --- a/libhb/stream.c +++ b/libhb/stream.c @@ -2942,7 +2942,7 @@ static int ffmpeg_open( hb_stream_t *stream, hb_title_t *title ) // we're opening for scan. let ffmpeg put some info into the // log about what we've got. av_log_set_level( AV_LOG_INFO ); - dump_format( ic, 0, stream->path, 0 ); + av_dump_format( ic, 0, stream->path, 0 ); av_log_set_level( AV_LOG_ERROR ); // accept this file if it has at least one video stream we can decode diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index fd08dd19..4a20105b 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -743,7 +743,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -779,7 +778,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -850,7 +848,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -892,7 +889,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -984,7 +980,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1026,7 +1021,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1118,7 +1112,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1160,7 +1153,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1252,7 +1244,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1294,7 +1285,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1389,7 +1379,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1431,7 +1420,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1526,7 +1514,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1568,7 +1555,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1663,7 +1649,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1705,7 +1690,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1800,7 +1784,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1842,7 +1825,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1945,7 +1927,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", @@ -1991,7 +1972,6 @@ "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a", "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", diff --git a/test/module.defs b/test/module.defs index 35a4d8bf..8cceceb6 100644 --- a/test/module.defs +++ b/test/module.defs @@ -10,7 +10,7 @@ TEST.c.o = $(patsubst $(SRC/)%.c,$(BUILD/)%.o,$(TEST.c)) TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI) TEST.libs = $(LIBHB.a) $(foreach n, \ - a52 ass avcore avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \ + a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \ ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \ $(CONTRIB.build/)lib/lib$(n).a ) -- 2.11.0