diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-04-18 17:25:21 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-05-06 14:27:34 +0100 |
| commit | 7b734ee55dbb8476d7ad63c7daf55c534cf82d5d (patch) | |
| tree | 89c68cd14f4d5ddfaf88ba36cd74d077ac7d4f5d | |
| parent | 34efb8a169e4551326e069be47125c6c2cb7ab90 (diff) | |
lavf: Open PICT images with Quickdraw
Update the pictor test to use the pictor codec, as both formats share
the .pic file extension.
| -rw-r--r-- | libavformat/img2.c | 3 | ||||
| -rw-r--r-- | tests/fate/image.mak | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 2128b2ecdf..0a840f8709 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -58,6 +58,9 @@ static const IdStrMap img_tags[] = { { AV_CODEC_ID_PTX, "ptx" }, { AV_CODEC_ID_BRENDER_PIX,"pix" }, { AV_CODEC_ID_PCX, "pcx" }, + { AV_CODEC_ID_QDRAW, "pic" }, + { AV_CODEC_ID_QDRAW, "pct" }, + { AV_CODEC_ID_QDRAW, "pict" }, { AV_CODEC_ID_SUNRAST, "sun" }, { AV_CODEC_ID_SUNRAST, "ras" }, { AV_CODEC_ID_SUNRAST, "rs" }, diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 3d8f6a842b..f652fea250 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -57,7 +57,7 @@ FATE_SAMPLES_AVCONV += $(FATE_EXR-yes) fate-exr: $(FATE_EXR-yes) FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor -fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 +fate-pictor: CMD = framecrc -c pictor -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/libav_4x_concat.png -pix_fmt rgba |