diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-19 01:32:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-19 02:08:59 +0200 |
| commit | 70d9fb696393277247101da47e67d568a6aea4d9 (patch) | |
| tree | adba052f93445216b060f2afd0dbefd76644d84a /tests | |
| parent | 35674a29b7f6cff70e3998b5d90feb693c817196 (diff) | |
| parent | d97ca425efeb468bc8e9db891385a909883177bb (diff) | |
| download | ffmpeg-70d9fb696393277247101da47e67d568a6aea4d9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sunrast: Check for out of bounds reads
lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
Add libvpx presets.
doc/avtools: add forgotten part to stream specifiers description
swscale: prevent overflow during initialization
g722: Add a fate test for the encoder
fate: Add a target for creating a 16000 Hz mono synthetic audio file
macosx: use the default surface on newer sdl
Conflicts:
ffplay.c
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 6 | ||||
| -rw-r--r-- | tests/fate2.mak | 4 | ||||
| -rw-r--r-- | tests/ref/fate/g722enc | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index 95271f0347..93f07a5bce 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -26,7 +26,11 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) @mkdir -p tests/data $(M)./$< $@ -tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN +tests/data/asynth-16000-1.sw: tests/audiogen$(HOSTEXESUF) + @mkdir -p tests/data + $(M)./$< $@ 16000 1 + +tests/data/asynth%.sw tests/vsynth%/00.pgm: TAG = GEN include $(SRC_PATH)/tests/fate.mak include $(SRC_PATH)/tests/fate2.mak diff --git a/tests/fate2.mak b/tests/fate2.mak index 0bb6654f8d..376a0196b6 100644 --- a/tests/fate2.mak +++ b/tests/fate2.mak @@ -133,6 +133,10 @@ fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav FATE_TESTS += fate-g722dec-1 fate-g722dec-1: CMD = framecrc -i $(SAMPLES)/g722/conf-adminmenu-162.g722 +FATE_TESTS += fate-g722enc +fate-g722enc: tests/data/asynth-16000-1.sw +fate-g722enc: CMD = md5 -ar 16000 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/asynth-16000-1.sw -acodec g722 -ac 1 -f g722 + FATE_TESTS += fate-msmpeg4v1 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an diff --git a/tests/ref/fate/g722enc b/tests/ref/fate/g722enc new file mode 100644 index 0000000000..c1094565b5 --- /dev/null +++ b/tests/ref/fate/g722enc @@ -0,0 +1 @@ +750269cc236541df28e15da5c7b0df7a |