diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 13:02:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 13:02:29 +0200 |
| commit | e4c0f258d38a961aff463c8474936771be7c561e (patch) | |
| tree | 9d806b02d731c883d6e1b2d82ca22f91ca988b5b /tests/fate/filter-audio.mak | |
| parent | 645d0384e85bb40b2307c559d0cfc914438e5bff (diff) | |
| parent | 9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d (diff) | |
| download | ffmpeg-e4c0f258d38a961aff463c8474936771be7c561e.tar.gz | |
Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'
* commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d':
afifo: fix request_samples on the last frame in certain cases
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/filter-audio.mak')
| -rw-r--r-- | tests/fate/filter-audio.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index fd244ec1ec..ab298e4aea 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -51,7 +51,7 @@ fate-filter-join: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-3.wav fate-filter-join: tests/data/asynth-44100-2.wav tests/data/asynth-44100-3.wav fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex join=channel_layout=5 -f s16le fate-filter-join: CMP = oneline -fate-filter-join: REF = 38fa1b18b0c46d77df6f17bfc4f078dd +fate-filter-join: REF = 409e66fc5ece4ddea4aa16bc47026bb0 FATE_AFILTER-$(call ALLYES, WAV_DEMUXER PCM_S16LE_DECODER PCM_S16LE_ENCODER PCM_S16LE_MUXER APERMS_FILTER VOLUME_FILTER) += fate-filter-volume fate-filter-volume: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav |