diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 18:51:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:16:57 +0200 |
| commit | eacf7d650dfe6e97d6100a232fa6a89592b625b5 (patch) | |
| tree | 08ac45fefde0eab9e8084743ee5a808f39f77d69 /tests/fate/filter-audio.mak | |
| parent | beeb7551d6ab44bc6a1125e6d537508bff3694fc (diff) | |
| parent | 0c1959b056f6ccaa2eee2c824352ba93c8e36d52 (diff) | |
| download | ffmpeg-streaming-eacf7d650dfe6e97d6100a232fa6a89592b625b5.zip ffmpeg-streaming-eacf7d650dfe6e97d6100a232fa6a89592b625b5.tar.gz | |
Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'
* commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52':
lavf: add AVFMT_FLAG_BITEXACT.
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/flacenc.c
libavformat/movenc.c
libavformat/oggenc.c
libavformat/options_table.h
libavformat/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/filter-audio.mak')
| -rw-r--r-- | tests/fate/filter-audio.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 725fb7e..210b89e 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -56,7 +56,7 @@ FATE_FILTER_CHANNELMAP += fate-filter-channelmap-one-int fate-filter-channelmap-one-int: tests/data/filtergraphs/channelmap_one_int fate-filter-channelmap-one-int: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.wav 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: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_int -f wav -fflags +bitexact fate-filter-channelmap-one-int: CMP = oneline fate-filter-channelmap-one-int: REF = 428b8f9fac6d57147069b97335019ef5 @@ -64,7 +64,7 @@ FATE_FILTER_CHANNELMAP += fate-filter-channelmap-one-str fate-filter-channelmap-one-str: tests/data/filtergraphs/channelmap_one_str fate-filter-channelmap-one-str: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav 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: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_str -f wav -fflags +bitexact fate-filter-channelmap-one-str: CMP = oneline fate-filter-channelmap-one-str: REF = e788890db6a11c2fb29d7c4229072d49 |
