lavf: Open PICT images with Quickdraw

Update the pictor test to use the pictor codec, as both formats share the .pic file extension.
10 years ago · 7b734ee55d
parent 34efb8a169
commit 7b734ee55d
2 changed files with 4 additions and 1 deletions
--- 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"       },
--- 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