Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'

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

Conflicts:
	tests/fate/image.mak

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

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 8493a3e824510cb5b7679ad82d71d01417eed200..cf8a47856f7d44562b4a57cca3681e7f6f02840f 100644 (file)
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -58,6 +58,9 @@ static const IdStrMap img_tags[] = {
     { AV_CODEC_ID_SGI,        "sgi"      },
     { AV_CODEC_ID_PTX,        "ptx"      },
     { 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"       },