diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:20:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:22:35 +0100 |
| commit | 10ac6f3ce9ae4065a5b72ddfaded45f75b357518 (patch) | |
| tree | 75473d06359d37848c47425c3a97874adeb7ed14 | |
| parent | ddfdcd2b5ecce0914c1eefa6269060bdbc879b17 (diff) | |
| parent | 952f943d40e9dbcd68bc851460cc99268091a294 (diff) | |
| download | ffmpeg-10ac6f3ce9ae4065a5b72ddfaded45f75b357518.tar.gz | |
Merge commit '952f943d40e9dbcd68bc851460cc99268091a294'
* commit '952f943d40e9dbcd68bc851460cc99268091a294':
FATE: add a jv test
Conflicts:
tests/fate/video.mak
tests/ref/fate/jv
See: 7c52070131b7eb7f867fe1eab7383498814826df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/video.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 43bfe5edb3..d00df1e405 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -163,7 +163,7 @@ FATE_VIDEO-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv -fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -pix_fmt rgb24 -an +fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, AVI, KGV1) += fate-kgv1 fate-kgv1: CMD = framecrc -i $(TARGET_SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an |