diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 20:52:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 21:05:16 +0200 |
| commit | ffed987a4d4afb8851d80b772eb9ee02cda20ef9 (patch) | |
| tree | c5eee86590050ef0cc5ae2ff7b57bf6a1de1e9fe | |
| parent | 39e89f521159474a854927840e5a8cc4350ee587 (diff) | |
| parent | 7b734ee55dbb8476d7ad63c7daf55c534cf82d5d (diff) | |
| download | ffmpeg-ffed987a4d4afb8851d80b772eb9ee02cda20ef9.tar.gz | |
Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'
* commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d':
lavf: Open PICT images with Quickdraw
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/img2.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 8493a3e824..cf8a47856f 100644 --- 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" }, |