OSDN > Developer > trrs20051007 > Chambre > handbrake-jp-git > Commit

handbrake-jp-git
Fork

Origine de Fork: handbrake-jp / handbrake-jp-git

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Révision	8296b674632d07820bdf2f62e8dc368afbe1d683 (tree)
l'heure	2011-02-28 03:41:24
Auteur	jstebbins <jstebbins@b64f...>
Commiter	jstebbins

Message de Log

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

modified: contrib/ffmpeg/module.defs (diff)
modified: gtk/src/Makefile.am (diff)
modified: libhb/module.defs (diff)
modified: libhb/stream.c (diff)
modified: macosx/HandBrake.xcodeproj/project.pbxproj (diff)
modified: test/module.defs (diff)

Modification

--- a/contrib/ffmpeg/module.defs

+++ b/contrib/ffmpeg/module.defs

		@@ -1,7 +1,7 @@
1	1	$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,BZIP2 ZLIB))
2	2	$(eval $(call import.CONTRIB.defs,FFMPEG))
3	3
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
5	5
6	6	FFMPEG.CONFIGURE.deps =
7	7	FFMPEG.CONFIGURE.env =

--- a/gtk/src/Makefile.am

+++ b/gtk/src/Makefile.am

		@@ -2,13 +2,13 @@
2	2
3	3	if MINGW
4	4	HB_LIBS= \
5		- -lhb -la52 -lmkv -lavformat -lavcodec -lavcore -lavutil -ldca -ldvdnav -ldvdread \
	5	+ -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
6	6	-lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
7	7	-lx264 -lmp4v2 -lswscale -ltheora -lz \
8	8	-lbz2 -liberty -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype
9	9	else
10	10	HB_LIBS= \
11		- -lhb -la52 -lmkv -lavformat -lavcodec -lavcore -lavutil -ldca -ldvdnav -ldvdread \
	11	+ -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
12	12	-lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
13	13	-lx264 -lmp4v2 -lswscale -ltheora -lz \
14	14	-lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype

--- a/libhb/module.defs

+++ b/libhb/module.defs

		@@ -92,7 +92,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll
92	92	LIBHB.lib = $(LIBHB.build/)hb.lib
93	93
94	94	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 \
96	96	ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
97	97	$(CONTRIB.build/)lib/lib$(n).a )
98	98

--- a/libhb/stream.c

+++ b/libhb/stream.c

		@@ -2942,7 +2942,7 @@ static int ffmpeg_open( hb_stream_t stream, hb_title_t title )
2942	2942	// we're opening for scan. let ffmpeg put some info into the
2943	2943	// log about what we've got.
2944	2944	av_log_set_level( AV_LOG_INFO );
2945		- dump_format( ic, 0, stream->path, 0 );
	2945	+ av_dump_format( ic, 0, stream->path, 0 );
2946	2946	av_log_set_level( AV_LOG_ERROR );
2947	2947
2948	2948	// 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 @@
743	743	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
744	744	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
745	745	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
746		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
747	746	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
748	747	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
749	748	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -779,7 +778,6 @@
779	778	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
780	779	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
781	780	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
782		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
783	781	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
784	782	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
785	783	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -850,7 +848,6 @@
850	848	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
851	849	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
852	850	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
853		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
854	851	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
855	852	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
856	853	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -892,7 +889,6 @@
892	889	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
893	890	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
894	891	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
895		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
896	892	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
897	893	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
898	894	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -984,7 +980,6 @@
984	980	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
985	981	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
986	982	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
987		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
988	983	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
989	984	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
990	985	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1026,7 +1021,6 @@
1026	1021	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1027	1022	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1028	1023	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1029		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1030	1024	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1031	1025	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1032	1026	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1118,7 +1112,6 @@
1118	1112	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1119	1113	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1120	1114	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1121		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1122	1115	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1123	1116	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1124	1117	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1160,7 +1153,6 @@
1160	1153	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1161	1154	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1162	1155	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1163		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1164	1156	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1165	1157	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1166	1158	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1252,7 +1244,6 @@
1252	1244	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1253	1245	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1254	1246	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1255		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1256	1247	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1257	1248	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1258	1249	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1294,7 +1285,6 @@
1294	1285	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1295	1286	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1296	1287	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1297		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1298	1288	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1299	1289	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1300	1290	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1389,7 +1379,6 @@
1389	1379	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1390	1380	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1391	1381	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1392		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1393	1382	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1394	1383	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1395	1384	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1431,7 +1420,6 @@
1431	1420	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1432	1421	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1433	1422	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1434		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1435	1423	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1436	1424	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1437	1425	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1526,7 +1514,6 @@
1526	1514	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1527	1515	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1528	1516	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1529		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1530	1517	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1531	1518	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1532	1519	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1568,7 +1555,6 @@
1568	1555	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1569	1556	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1570	1557	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1571		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1572	1558	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1573	1559	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1574	1560	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1663,7 +1649,6 @@
1663	1649	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1664	1650	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1665	1651	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1666		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1667	1652	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1668	1653	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1669	1654	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1705,7 +1690,6 @@
1705	1690	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1706	1691	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1707	1692	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1708		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1709	1693	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1710	1694	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1711	1695	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1800,7 +1784,6 @@
1800	1784	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1801	1785	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1802	1786	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1803		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1804	1787	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1805	1788	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1806	1789	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1842,7 +1825,6 @@
1842	1825	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1843	1826	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1844	1827	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1845		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1846	1828	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1847	1829	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1848	1830	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1945,7 +1927,6 @@
1945	1927	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1946	1928	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1947	1929	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1948		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1949	1930	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1950	1931	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1951	1932	"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",

		@@ -1991,7 +1972,6 @@
1991	1972	"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
1992	1973	"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
1993	1974	"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
1994		- "$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
1995	1975	"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
1996	1976	"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
1997	1977	"$(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))
10	10	TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
11	11
12	12	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 \
14	14	ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
15	15	$(CONTRIB.build/)lib/lib$(n).a )
16	16

handbrake-jp-git Fork