diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 13:28:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 13:28:24 +0200 |
| commit | eeb6efcd58bc4a4022bf4b3e807d02ce66cad839 (patch) | |
| tree | cdbdd4374c26349da0b047324419172f7453bd6e /tests | |
| parent | 32a7b858c9175b851503dc3fa66440efe2afd3ee (diff) | |
| parent | 08dd2c9df1c121844af5d6a8915aef9c2ba49962 (diff) | |
| download | ffmpeg-eeb6efcd58bc4a4022bf4b3e807d02ce66cad839.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
fate: add tests for unknown channel layouts.
lavfi/buffersrc: update for compatibility with the fork.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/ffmpeg.mak | 11 | ||||
| -rw-r--r-- | tests/ref/fate/unknown_layout-ac3 | 1 | ||||
| -rw-r--r-- | tests/ref/fate/unknown_layout-pcm | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index b96bfb3299..21cdd5f4af 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -35,3 +35,14 @@ fate-sub2video: CMD = framecrc \ -ss 132 -i $(SAMPLES)/sub/vobsub.idx \ -filter_complex "sws_flags=+accurate_rnd+bitexact;[0:0]scale=720:480[v];[v][1:0]overlay[v2]" \ -map "[v2]" -c:v rawvideo -map 1:s -c:s dvdsub + +FATE_FFMPEG-$(call ALLYES, PCM_S16LE_DEMUXER PCM_S16LE_MUXER PCM_S16LE_DECODER PCM_S16LE_ENCODER) += fate-unknown_layout-pcm +fate-unknown_layout-pcm: $(AREF) +fate-unknown_layout-pcm: CMD = md5 \ + -guess_layout_max 0 -f s16le -ac 1 -ar 44100 -i $(AREF) -f s16le + +FATE_FFMPEG-$(call ALLYES, PCM_S16LE_DEMUXER AC3_MUXER PCM_S16LE_DECODER AC3_FIXED_ENCODER) += fate-unknown_layout-ac3 +fate-unknown_layout-ac3: $(AREF) +fate-unknown_layout-ac3: CMD = md5 \ + -guess_layout_max 0 -f s16le -ac 1 -ar 44100 -i $(AREF) \ + -f ac3 -flags +bitexact -c ac3_fixed diff --git a/tests/ref/fate/unknown_layout-ac3 b/tests/ref/fate/unknown_layout-ac3 new file mode 100644 index 0000000000..d332efcec4 --- /dev/null +++ b/tests/ref/fate/unknown_layout-ac3 @@ -0,0 +1 @@ +bbb7550d6d93973c10f4ee13c87cf799 diff --git a/tests/ref/fate/unknown_layout-pcm b/tests/ref/fate/unknown_layout-pcm new file mode 100644 index 0000000000..73c6a2dbab --- /dev/null +++ b/tests/ref/fate/unknown_layout-pcm @@ -0,0 +1 @@ +4dada0795adf50f7a0e60861658f86ea |