diff options
author | Clément Bœsch <u@pkh.me> | 2017-03-24 11:37:44 +0100 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-03-24 11:40:35 +0100 |
commit | 71d541751ef10255ec8b179b014246e69a9c060b (patch) | |
tree | 91471868e9c4339f46aaecc9a8d74ce5ebe038c5 /tests/fate/real.mak | |
parent | 30ac66abf0995c3a9a6c5370d357e51268b1b69f (diff) | |
parent | 043b0b9fb1481053b712d06d2c5b772f1845b72b (diff) | |
download | ffmpeg-71d541751ef10255ec8b179b014246e69a9c060b.tar.gz |
Merge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'
* commit '043b0b9fb1481053b712d06d2c5b772f1845b72b':
Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|v
The merge also includes all our own occurences.
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'tests/fate/real.mak')
-rw-r--r-- | tests/fate/real.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/real.mak b/tests/fate/real.mak index f9073dde8f..dd5f9c61db 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -42,7 +42,7 @@ fate-sipr-8k5: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_8k5.rm fate-sipr-8k5: REF = $(SAMPLES)/sipr/sipr_8k5.pcm FATE_SIPR += fate-sipr-16k -fate-sipr-16k: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_16k.rm -aframes 3250 +fate-sipr-16k: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_16k.rm -frames:a 3250 fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm fate-sipr-16k: SIZE_TOLERANCE = 40000 |