diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 02:12:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 03:10:08 +0200 |
| commit | 9d56ccf5af52cb6d937c85c6c205cd38fa9d54ba (patch) | |
| tree | 90555a38c78062885be162271998559c64fe80ff /tests/fate/vcodec.mak | |
| parent | fd7e1190379db1b2b3eaa31c00dc9c92803faef3 (diff) | |
| download | ffmpeg-9d56ccf5af52cb6d937c85c6c205cd38fa9d54ba.tar.gz | |
j2k/jpeg2000dec: merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/vcodec.mak')
| -rw-r--r-- | tests/fate/vcodec.mak | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 167d97ce24..7aed08961b 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -89,11 +89,11 @@ FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls fate-vsynth%-jpegls: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-jpegls: DECOPTS = -sws_flags area -FATE_VCODEC-$(call ENCDEC, J2K, AVI) += j2k j2k-97 -fate-vsynth%-j2k: ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24 -fate-vsynth%-j2k: DECINOPTS = -vcodec j2k -strict experimental -fate-vsynth%-j2k-97: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 -fate-vsynth%-j2k-97: DECINOPTS = -vcodec j2k -strict experimental +FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97 +fate-vsynth%-jpeg2000: ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24 +fate-vsynth%-jpeg2000: DECINOPTS = -vcodec jpeg2000 +fate-vsynth%-jpeg2000-97: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 +fate-vsynth%-jpeg2000-97: DECINOPTS = -vcodec jpeg2000 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg fate-vsynth%-ljpeg: ENCOPTS = -strict -1 |