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/hevc.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/hevc.mak')
| -rw-r--r-- | tests/fate/hevc.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index 140fa2a72e..2e798eca60 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -235,7 +235,7 @@ tests/data/hevc-mp4.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data FATE_HEVC-$(call ALLYES, HEVC_DEMUXER MOV_DEMUXER HEVC_MP4TOANNEXB_BSF MOV_MUXER HEVC_MUXER) += fate-hevc-bsf-mp4toannexb fate-hevc-bsf-mp4toannexb: tests/data/hevc-mp4.mov -fate-hevc-bsf-mp4toannexb: CMD = md5 -i $(TARGET_PATH)/tests/data/hevc-mp4.mov -vcodec copy -fflags +bitexact -f hevc +fate-hevc-bsf-mp4toannexb: CMD = md5 -i $(TARGET_PATH)/tests/data/hevc-mp4.mov -c:v copy -fflags +bitexact -f hevc fate-hevc-bsf-mp4toannexb: CMP = oneline fate-hevc-bsf-mp4toannexb: REF = 1873662a3af1848c37e4eb25722c8df9 |