diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 21:45:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 21:45:52 +0200 |
| commit | 67732b9d62576c67589773e5332e94aac429cc4c (patch) | |
| tree | bb7e865164fd3ed8365be014d3b1bf420d347ff0 /tests/Makefile | |
| parent | b4d44367bc45b7bafd61c4bf59434bc517a6a440 (diff) | |
| parent | a8656cd425babe6a2fe12aff826de57f28b8efcd (diff) | |
| download | ffmpeg-67732b9d62576c67589773e5332e94aac429cc4c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegts: Remove disabled extension matching probe.
fate: avoid freopen(NULL) in videogen/rotozoom
Conflicts:
tests/rotozoom.c
tests/videogen.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index e9d9fc578d..53c181131c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -28,10 +28,10 @@ tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data $(M)./$< $@ $(subst -, ,$*) tests/data/vsynth1.yuv: tests/videogen$(HOSTEXESUF) | tests/data - $(M)$< >$@ + $(M)$< $@ tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data - $(M)$< $(SRC_PATH)/tests/lena.pnm >$@ + $(M)$< $(SRC_PATH)/tests/lena.pnm $@ tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN |