diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-19 03:18:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-19 03:18:07 +0100 |
| commit | d2d794f3aa55ab77557bb1d6082f9f6dfa90400d (patch) | |
| tree | f36a4d311c359521d3fedf97417def9e80db158c /tests | |
| parent | fde74d1b9d338e2f9c9d7eac2023388d59c98543 (diff) | |
| parent | e121a725c38fe9f0749e96d45738c55fdcfe2ac5 (diff) | |
| download | ffmpeg-d2d794f3aa55ab77557bb1d6082f9f6dfa90400d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Explicitly specify the pixel format for the pngparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/image.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index ce32b36bc1..7c2ac10841 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -25,7 +25,7 @@ FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser -fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png +fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png -pix_fmt rgba FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 |