diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-05 22:10:45 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-05 22:22:09 +0400 |
| commit | 517dcc9b5fc4294669c0b6edaaa3ff166d412219 (patch) | |
| tree | afff025f131c22971259fd339a1663191fbb3a20 /tests/Makefile | |
| parent | 5f4e18cd162be2375cdd623816de58207b0b8a31 (diff) | |
| parent | f0ccd53a3b0bbe704a7bc94dbc8caac7be81e079 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
tests: Refactor rotozoom/videogen common code into a separate file.
tests: Mark some file-internal symbols as static.
build: Drop leftover .exp pattern from LIBSUFFIXES list.
vsrc_buffer: return EAGAIN if no frame is available.
WMAL: Shift output samples by the specified number of padding zeroes.
WMAL: Restore removed code in mclms_predict()
rtpdec_h264: Remove a useless ifdef
rtpdec_h264: Remove outdated/useless/incorrect comments
rtpdec_h264: Remove useless memory corruption checks
rtpdec_h264: Return proper error codes
rtpdec_h264: Check the available data length before reading
rtpdec_h264: Add input size checks
png: check bit depth for PAL8/Y400A pixel formats.
ea: check chunk_size for validity.
celp filters: Do not read earlier than the start of the 'out' vector.
Conflicts:
libavcodec/pngdec.c
libavfilter/src_buffer.c
tests/rotozoom.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index bbe8eec0f6..c8a55892b8 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -17,6 +17,9 @@ ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw OBJDIRS += tests/data tests/vsynth1 tests/vsynth2 +# Required due to missing automatic dependency tracking for HOSTOBJS. +tests/rotozoom.o tests/videogen.o: tests/utils.c + tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) | tests/vsynth1 $(M)./$< 'tests/vsynth1/' |