Browse Source

lavf: Open PICT images with Quickdraw

Update the pictor test to use the pictor codec, as both formats share
the .pic file extension.
tags/n2.7
Vittorio Giovara 10 years ago
parent
commit
7b734ee55d
2 changed files with 4 additions and 1 deletions
  1. +3
    -0
      libavformat/img2.c
  2. +1
    -1
      tests/fate/image.mak

+ 3
- 0
libavformat/img2.c View File

@@ -58,6 +58,9 @@ static const IdStrMap img_tags[] = {
{ AV_CODEC_ID_PTX, "ptx" }, { AV_CODEC_ID_PTX, "ptx" },
{ AV_CODEC_ID_BRENDER_PIX,"pix" }, { AV_CODEC_ID_BRENDER_PIX,"pix" },
{ AV_CODEC_ID_PCX, "pcx" }, { 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, "sun" },
{ AV_CODEC_ID_SUNRAST, "ras" }, { AV_CODEC_ID_SUNRAST, "ras" },
{ AV_CODEC_ID_SUNRAST, "rs" }, { AV_CODEC_ID_SUNRAST, "rs" },


+ 1
- 1
tests/fate/image.mak View File

@@ -57,7 +57,7 @@ FATE_SAMPLES_AVCONV += $(FATE_EXR-yes)
fate-exr: $(FATE_EXR-yes) fate-exr: $(FATE_EXR-yes)


FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor 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_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 fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/libav_4x_concat.png -pix_fmt rgba


Loading…
Cancel
Save