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/demux.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/demux.mak')
| -rw-r--r-- | tests/fate/demux.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index cee4bd4bf9..cf69e2fe2c 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -58,7 +58,7 @@ fate-mkv: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/test7_cut.mkv -c copy #No dts errors or duplicate DTS should be in this FATE_SAMPLES_DEMUX-$(call DEMDEC, MATROSKA, H264) += fate-mkv-1242 -fate-mkv-1242: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/1242-small.mkv -c copy -vframes 11 +fate-mkv-1242: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/1242-small.mkv -c copy -frames:v 11 FATE_SAMPLES_DEMUX-$(CONFIG_MLV_DEMUXER) += fate-mlv-demux fate-mlv-demux: CMD = crc -i $(TARGET_SAMPLES)/mlv/M19-0333-cut.MLV -c copy |