1. ffmpeg
  2. Commit ffed987a4d4afb8851d80b772eb9ee02cda20ef9
Browse code

Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'

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

Conflicts:
tests/fate/image.mak

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

Michael Niedermayer authored on 2015/05/07 03:52:07
Showing 1 changed files
libavformat/img2.c
History View file @ ffed987
... ... 
@@ -58,6 +58,9 @@ static const IdStrMap img_tags[] = {
58 58 
     { AV_CODEC_ID_SGI,        "sgi"      },
59 59 
     { AV_CODEC_ID_PTX,        "ptx"      },
60 60 
     { AV_CODEC_ID_PCX,        "pcx"      },
61 
+    { AV_CODEC_ID_QDRAW,      "pic"      },
62 
+    { AV_CODEC_ID_QDRAW,      "pct"      },
63 
+    { AV_CODEC_ID_QDRAW,      "pict"     },
61 64 
     { AV_CODEC_ID_SUNRAST,    "sun"      },
62 65 
     { AV_CODEC_ID_SUNRAST,    "ras"      },
63 66 
     { AV_CODEC_ID_SUNRAST,    "rs"       },