Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'

* commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d':
  lavf: Open PICT images with Quickdraw

Conflicts:
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/img2.c
index 8493a3e,0a840f8..cf8a478
--- 1/libavformat/img2.c
--- 2/libavformat/img2.c
+++ b/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"       },