diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:03:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:03:20 +0200 |
| commit | 3974889614e04f700637b564df737c180d8583ea (patch) | |
| tree | 7dc5805927d14c1e6900aa9ac97ab9c53b7cb20c /tests/fate/video.mak | |
| parent | 2e13a45b1a9a69456631e582bbb06954d169eb55 (diff) | |
| parent | e2bd03a14a4e3366df0b1ee8e284a97165be1f3c (diff) | |
| download | ffmpeg-3974889614e04f700637b564df737c180d8583ea.tar.gz | |
Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'
* commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c':
fate: Avoid unnecessary pixel format conversions
Conflicts:
tests/fate/image.mak
tests/ref/fate/dds-ya
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/video.mak')
| -rw-r--r-- | tests/fate/video.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index aecb0e5a03..0f7b8eb05d 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -290,10 +290,10 @@ FATE_VIDEO-$(call DEMDEC, TMV, TMV) += fate-tmv fate-tmv: CMD = framecrc -i $(TARGET_SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24 FATE_TXD += fate-txd-16bpp -fate-txd-16bpp: CMD = framecrc -i $(TARGET_SAMPLES)/txd/misc.txd -pix_fmt bgra -an +fate-txd-16bpp: CMD = framecrc -i $(TARGET_SAMPLES)/txd/misc.txd -an FATE_TXD += fate-txd-odd -fate-txd-odd: CMD = framecrc -i $(TARGET_SAMPLES)/txd/odd.txd -pix_fmt bgra -an +fate-txd-odd: CMD = framecrc -i $(TARGET_SAMPLES)/txd/odd.txd -an FATE_TXD += fate-txd-pal8 fate-txd-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an |