diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:08:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:08:55 +0200 |
| commit | 79ec524ff52aa641896f755b63e933ab2877763c (patch) | |
| tree | d3750e2e5d798ea76e4673263cdfd05a93c3f3b4 /tests/Makefile | |
| parent | 35ce42e07029b3af62f652a53719fee99bb7a5aa (diff) | |
| parent | ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25 (diff) | |
| download | ffmpeg-79ec524ff52aa641896f755b63e933ab2877763c.tar.gz | |
Merge commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25'
* commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25':
mpegaudiodec: Fix buffer handling on random access
mpegaudio: Refactor mp3on4 flush function
fate: Add dependencies for audio tests
fate: cosmetics: Group idct8x8 test together with all other libavcodec tests
fate: More fine-grained dependencies for libavcodec test programs
Conflicts:
tests/fate/audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index 6fb2eddaf6..54987afee4 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -75,7 +75,6 @@ include $(SRC_PATH)/tests/fate/audio.mak include $(SRC_PATH)/tests/fate/bmp.mak include $(SRC_PATH)/tests/fate/cdxl.mak include $(SRC_PATH)/tests/fate/cover-art.mak -include $(SRC_PATH)/tests/fate/dct.mak include $(SRC_PATH)/tests/fate/demux.mak include $(SRC_PATH)/tests/fate/dfa.mak include $(SRC_PATH)/tests/fate/dpcm.mak |