• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonbathyscaphephpgamewindowsguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

githubのコードからのfolk


Commit MetaInfo

Revision8296b674632d07820bdf2f62e8dc368afbe1d683 (tree)
Time2011-02-28 03:41:24
Authorjstebbins <jstebbins@b64f...>
Commiterjstebbins

Log Message

bump ffmpeg from git-185a155 to git-0b32da9
fixes win64 crash

git-svn-id: svn://localhost/HandBrake/trunk@3818 b64f7644-9d1e-0410-96f1-a4d463321fa5

Change Summary

Incremental Difference

--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -1,7 +1,7 @@
11 $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,BZIP2 ZLIB))
22 $(eval $(call import.CONTRIB.defs,FFMPEG))
33
4-FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/ffmpeg-git-185a155.tar.bz2
4+FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/ffmpeg-git-0b32da9.tar.bz2
55
66 FFMPEG.CONFIGURE.deps =
77 FFMPEG.CONFIGURE.env =
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -2,13 +2,13 @@
22
33 if MINGW
44 HB_LIBS= \
5- -lhb -la52 -lmkv -lavformat -lavcodec -lavcore -lavutil -ldca -ldvdnav -ldvdread \
5+ -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
66 -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
77 -lx264 -lmp4v2 -lswscale -ltheora -lz \
88 -lbz2 -liberty -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype
99 else
1010 HB_LIBS= \
11- -lhb -la52 -lmkv -lavformat -lavcodec -lavcore -lavutil -ldca -ldvdnav -ldvdread \
11+ -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
1212 -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
1313 -lx264 -lmp4v2 -lswscale -ltheora -lz \
1414 -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -92,7 +92,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll
9292 LIBHB.lib = $(LIBHB.build/)hb.lib
9393
9494 LIBHB.dll.libs = $(foreach n, \
95- a52 ass avcore avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
95+ a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
9696 ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
9797 $(CONTRIB.build/)lib/lib$(n).a )
9898
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -2942,7 +2942,7 @@ static int ffmpeg_open( hb_stream_t *stream, hb_title_t *title )
29422942 // we're opening for scan. let ffmpeg put some info into the
29432943 // log about what we've got.
29442944 av_log_set_level( AV_LOG_INFO );
2945- dump_format( ic, 0, stream->path, 0 );
2945+ av_dump_format( ic, 0, stream->path, 0 );
29462946 av_log_set_level( AV_LOG_ERROR );
29472947
29482948 // accept this file if it has at least one video stream we can decode
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -743,7 +743,6 @@
743743 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
744744 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
745745 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
746- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
747746 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
748747 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
749748 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -779,7 +778,6 @@
779778 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
780779 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
781780 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
782- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
783781 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
784782 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
785783 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -850,7 +848,6 @@
850848 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
851849 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
852850 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
853- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
854851 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
855852 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
856853 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -892,7 +889,6 @@
892889 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
893890 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
894891 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
895- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
896892 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
897893 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
898894 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -984,7 +980,6 @@
984980 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
985981 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
986982 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
987- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
988983 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
989984 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
990985 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1026,7 +1021,6 @@
10261021 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
10271022 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
10281023 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1029- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
10301024 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
10311025 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
10321026 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1118,7 +1112,6 @@
11181112 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
11191113 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
11201114 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1121- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
11221115 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
11231116 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
11241117 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1160,7 +1153,6 @@
11601153 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
11611154 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
11621155 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1163- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
11641156 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
11651157 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
11661158 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1252,7 +1244,6 @@
12521244 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
12531245 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
12541246 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1255- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
12561247 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
12571248 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
12581249 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1294,7 +1285,6 @@
12941285 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
12951286 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
12961287 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1297- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
12981288 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
12991289 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
13001290 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1389,7 +1379,6 @@
13891379 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
13901380 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
13911381 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1392- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
13931382 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
13941383 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
13951384 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1431,7 +1420,6 @@
14311420 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
14321421 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
14331422 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1434- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
14351423 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
14361424 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
14371425 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1526,7 +1514,6 @@
15261514 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
15271515 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
15281516 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1529- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
15301517 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
15311518 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
15321519 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1568,7 +1555,6 @@
15681555 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
15691556 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
15701557 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1571- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
15721558 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
15731559 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
15741560 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1663,7 +1649,6 @@
16631649 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
16641650 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
16651651 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1666- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
16671652 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
16681653 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
16691654 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1705,7 +1690,6 @@
17051690 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
17061691 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
17071692 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1708- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
17091693 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
17101694 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
17111695 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1800,7 +1784,6 @@
18001784 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
18011785 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
18021786 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1803- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
18041787 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
18051788 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
18061789 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1842,7 +1825,6 @@
18421825 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
18431826 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
18441827 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1845- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
18461828 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
18471829 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
18481830 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1945,7 +1927,6 @@
19451927 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
19461928 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
19471929 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1948- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
19491930 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
19501931 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
19511932 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1991,7 +1972,6 @@
19911972 "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
19921973 "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
19931974 "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1994- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
19951975 "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
19961976 "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
19971977 "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
--- a/test/module.defs
+++ b/test/module.defs
@@ -10,7 +10,7 @@ TEST.c.o = $(patsubst $(SRC/)%.c,$(BUILD/)%.o,$(TEST.c))
1010 TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
1111
1212 TEST.libs = $(LIBHB.a) $(foreach n, \
13- a52 ass avcore avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
13+ a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
1414 ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
1515 $(CONTRIB.build/)lib/lib$(n).a )
1616