diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-16 01:20:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-16 01:33:35 +0100 |
| commit | 4a4c4278b716b49b9f1653df4ac4f1f026606081 (patch) | |
| tree | e1f9e2855fb0dc8a836ff795bd0eb95b48af30bd /tests/Makefile | |
| parent | f94ce3bcab67369b18976f6cf8e69ae132805213 (diff) | |
| parent | 2df5f59ad0710a0d85114b73bd6a5094c26d08bc (diff) | |
| download | ffmpeg-4a4c4278b716b49b9f1653df4ac4f1f026606081.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: split ADPCM and DPCM test references into separate files.
mov, mxfdec: Employ more meaningful return values.
lavc: Relax API strictness in avcodec_decode_audio3 with a custom get_buffer()
wavpack: fix clipping for 32-bit lossy mode
vb: Use bytestream2 functions
Conflicts:
libavcodec/utils.c
libavcodec/vb.c
libavformat/mxfdec.c
tests/fate/dpcm.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index 51ff9182b7..6ee408ab14 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -42,6 +42,7 @@ tests/data/asynth%.sw tests/vsynth%/00.pgm: TAG = GEN include $(SRC_PATH)/tests/fate/aac.mak include $(SRC_PATH)/tests/fate/ac3.mak +include $(SRC_PATH)/tests/fate/adpcm.mak include $(SRC_PATH)/tests/fate/als.mak include $(SRC_PATH)/tests/fate/amrnb.mak include $(SRC_PATH)/tests/fate/amrwb.mak |