Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 18:52:07 +0000 (20:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 19:05:16 +0000 (21:05 +0200)
* commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d':
  lavf: Open PICT images with Quickdraw

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/img2.c

@@@ -57,7 -56,11 +57,10 @@@ static const IdStrMap img_tags[] = 
      { AV_CODEC_ID_TIFF,       "tif"      },
      { AV_CODEC_ID_SGI,        "sgi"      },
      { 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"       },