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/fifo-muxer.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/fifo-muxer.mak')
| -rw-r--r-- | tests/fate/fifo-muxer.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/fifo-muxer.mak b/tests/fate/fifo-muxer.mak index fb68d5910b..ef8b3b3c7b 100644 --- a/tests/fate/fifo-muxer.mak +++ b/tests/fate/fifo-muxer.mak @@ -1,4 +1,4 @@ -fate-fifo-muxer-h264: CMD = ffmpeg -i $(TARGET_SAMPLES)/mkv/1242-small.mkv -vframes 11\ +fate-fifo-muxer-h264: CMD = ffmpeg -i $(TARGET_SAMPLES)/mkv/1242-small.mkv -frames:v 11\ -c:v copy -c:a copy -map v:0 -map a:0 -flags +bitexact\ -fflags +bitexact -f fifo -fifo_format framecrc - fate-fifo-muxer-h264: REF = $(SRC_PATH)/tests/ref/fate/mkv-1242 |