diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 01:23:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 01:23:58 +0200 |
| commit | 8b132bb7b97091524ba7ff8d500afbc5e2a8a30a (patch) | |
| tree | a096297d56b8ec50b788bb14bb9d3f2bc2a13405 /tests | |
| parent | 32388e04a80139740e495639e3237e99de3b5662 (diff) | |
| parent | c2b0ce70add2a7dd6e792341c21278cb94820684 (diff) | |
| download | ffmpeg-8b132bb7b97091524ba7ff8d500afbc5e2a8a30a.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Initialize riff and wav size fields to -1 instead of 0.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/filter-audio.mak | 4 | ||||
| -rw-r--r-- | tests/ref/fate/mapchan-6ch-extract-2 | 4 | ||||
| -rw-r--r-- | tests/ref/fate/mapchan-6ch-extract-2-downmix-mono | 2 | ||||
| -rw-r--r-- | tests/ref/fate/mapchan-silent-mono | 2 | ||||
| -rw-r--r-- | tests/ref/fate/v410enc | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index ef5121623c..725fb7ea27 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -58,7 +58,7 @@ fate-filter-channelmap-one-int: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.w fate-filter-channelmap-one-int: tests/data/asynth-44100-6.wav fate-filter-channelmap-one-int: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_int -f wav -flags +bitexact fate-filter-channelmap-one-int: CMP = oneline -fate-filter-channelmap-one-int: REF = 06168d06085e2c0603e4e118ba4cade2 +fate-filter-channelmap-one-int: REF = 428b8f9fac6d57147069b97335019ef5 FATE_FILTER_CHANNELMAP += fate-filter-channelmap-one-str fate-filter-channelmap-one-str: tests/data/filtergraphs/channelmap_one_str @@ -66,7 +66,7 @@ fate-filter-channelmap-one-str: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.w fate-filter-channelmap-one-str: tests/data/asynth-44100-2.wav fate-filter-channelmap-one-str: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_str -f wav -flags +bitexact fate-filter-channelmap-one-str: CMP = oneline -fate-filter-channelmap-one-str: REF = 49ed4aaec717f1b28137c9e1f01f343b +fate-filter-channelmap-one-str: REF = e788890db6a11c2fb29d7c4229072d49 FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_FILTER_CHANNELMAP) diff --git a/tests/ref/fate/mapchan-6ch-extract-2 b/tests/ref/fate/mapchan-6ch-extract-2 index ba08c864b5..435cbec17c 100644 --- a/tests/ref/fate/mapchan-6ch-extract-2 +++ b/tests/ref/fate/mapchan-6ch-extract-2 @@ -1,2 +1,2 @@ -3be6f8cefbf3c2e6dce670ee190b4313 -b8791d1c07de59dd1badf2c7b5f62a74 +955514d4a026a4a48695866d2ec904d0 +498a49e692ee2e3c454863654275c4bb diff --git a/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono b/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono index 618b9d9f7d..a47c85cd6b 100644 --- a/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono +++ b/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono @@ -1 +1 @@ -e02d9537df5f534d14937bf7ab9b9a40 +2727e5418eb5b8f89954f140d9f3a19a diff --git a/tests/ref/fate/mapchan-silent-mono b/tests/ref/fate/mapchan-silent-mono index 7d77801e1a..f720c318f4 100644 --- a/tests/ref/fate/mapchan-silent-mono +++ b/tests/ref/fate/mapchan-silent-mono @@ -1 +1 @@ -c37237a92bcf708bc0e20b713665a5a7 +16dc73c037897dff9b1d3e3d8561dc73 diff --git a/tests/ref/fate/v410enc b/tests/ref/fate/v410enc index ab219bbed1..b2c728e9b2 100644 --- a/tests/ref/fate/v410enc +++ b/tests/ref/fate/v410enc @@ -1 +1 @@ -e5c0b1f17d2a64a416dcf9bf7a38d9d9 +f7cf1b743c18f74d047ce8d6ea05d3d9 |