diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-03 21:28:07 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-03 21:28:07 -0300 |
| commit | a2b0602cdad8da62c137f7db07b608d6bbbcefaa (patch) | |
| tree | 67220614b5797dc9bd6ea58244a1a2e1e2e3197b /tests/fate/ffmpeg.mak | |
| parent | 08c751309670854c73b58f234a83f4ba679370be (diff) | |
| parent | 4141a5a240fba44b4b4a1c488c279d7dd8a11ec7 (diff) | |
| download | ffmpeg-a2b0602cdad8da62c137f7db07b608d6bbbcefaa.tar.gz | |
Merge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'
* commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7':
Use modern avconv syntax for codec selection in documentation and tests
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests/fate/ffmpeg.mak')
| -rw-r--r-- | tests/fate/ffmpeg.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index f3fbc841b2..d8f2e71590 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -101,7 +101,7 @@ fate-streamcopy: $(FATE_STREAMCOPY-yes) FATE_SAMPLES_FFMPEG-$(call ALLYES, MOV_DEMUXER MATROSKA_MUXER) += fate-rgb24-mkv fate-rgb24-mkv: $(TARGET_SAMPLES)/qtrle/aletrek-rle.mov fate-rgb24-mkv: CMD = transcode "mov" $(TARGET_SAMPLES)/qtrle/aletrek-rle.mov\ - matroska "-vcodec rawvideo -pix_fmt rgb24 -allow_raw_vfw 1 -frames:v 1" + matroska "-c:v rawvideo -pix_fmt rgb24 -allow_raw_vfw 1 -frames:v 1" FATE_SAMPLES_FFMPEG-$(call ALLYES, AAC_DEMUXER MOV_MUXER) += fate-adtstoasc_ticket3715 fate-adtstoasc_ticket3715: $(TARGET_SAMPLES)/aac/foo.aac |