Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: source/patched-ffmpeg-mt/Makefile

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/patched-ffmpeg-mt/MAINTAINERS ('k') | source/patched-ffmpeg-mt/common.mak » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/Makefile
===================================================================
--- source/patched-ffmpeg-mt/Makefile (revision 59334)
+++ source/patched-ffmpeg-mt/Makefile (working copy)
@@ -92,7 +92,7 @@
tools/%.o: tools/%.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(CC_O) $<
-ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)
+ffplay.o: CFLAGS += $(SDL_CFLAGS)
VERSION_SH = $(SRC_PATH_BARE)/version.sh
GIT_LOG = $(SRC_PATH_BARE)/.git/logs/HEAD
@@ -236,11 +236,10 @@
include $(SRC_PATH_BARE)/tests/fate/als.mak
include $(SRC_PATH_BARE)/tests/fate/fft.mak
include $(SRC_PATH_BARE)/tests/fate/h264.mak
+include $(SRC_PATH_BARE)/tests/fate/mp3.mak
include $(SRC_PATH_BARE)/tests/fate/vorbis.mak
include $(SRC_PATH_BARE)/tests/fate/vp8.mak
-FATE_TESTS += $(FATE2_TESTS)
-
FATE_ACODEC = $(ACODEC_TESTS:%=fate-acodec-%)
FATE_VSYNTH1 = $(VCODEC_TESTS:%=fate-vsynth1-%)
FATE_VSYNTH2 = $(VCODEC_TESTS:%=fate-vsynth2-%)
@@ -278,17 +277,19 @@
ifdef SAMPLES
FATE += $(FATE_TESTS)
else
-fate2 $(FATE_TESTS):
+$(FATE_TESTS):
@echo "SAMPLES not specified, cannot run FATE"
endif
FATE_UTILS = base64 tiny_psnr
fate: $(FATE)
-fate2: $(FATE2_TESTS)
$(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
@echo "TEST $(@:fate-%=%)"
$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)'
+fate-list:
+ @printf '%s\n' $(sort $(FATE))
+
.PHONY: documentation *test regtest-* alltools check config
« no previous file with comments | « source/patched-ffmpeg-mt/MAINTAINERS ('k') | source/patched-ffmpeg-mt/common.mak » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698