diff options
| author | James Almer <jamrial@gmail.com> | 2016-06-26 15:14:17 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-06-26 15:14:17 -0300 |
| commit | 104c357b6a3ee181e1d657df68e38c17ba2bda77 (patch) | |
| tree | 8de7acbcf90609e153169a3d0c65eba46b93b15c /tests/fate/screen.mak | |
| parent | b2a74dd629c1ab3318ba0123f8814797a4fea3a4 (diff) | |
| parent | e9394ca63dab3434bc8e869de019ecd86cb604ac (diff) | |
| download | ffmpeg-104c357b6a3ee181e1d657df68e38c17ba2bda77.tar.gz | |
Merge branch 'master' into release/3.1
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests/fate/screen.mak')
| -rw-r--r-- | tests/fate/screen.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index deb84652a2..eb70ea2cba 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -3,7 +3,7 @@ FATE_SCREEN-$(call DEMDEC, AVI, CSCD) += fate-cscd fate-cscd: CMD = framecrc -i $(TARGET_SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24 FATE_SCREEN-$(call DEMDEC, AVI, DXTORY) += fate-dxtory -fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi +fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi -an FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FIC) += fate-fic-avi fate-fic-avi: CMD = framecrc -i $(TARGET_SAMPLES)/fic/fic-partial-2MB.avi -an |