aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/img2.c
diff options
context:
space:
mode:
authorMartin Lambers <marlam@marlam.de>2012-01-30 11:28:08 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-01-30 11:28:08 +0100
commit6fe12c7ff2094c68a8b6e9aeea7744ca15594091 (patch)
tree081a7bf61cec58039ad72f8506ebdefc3244f6d8 /libavformat/img2.c
parent36436a4032b022f5439fa86a0986065d24cd51fd (diff)
downloadffmpeg-6fe12c7ff2094c68a8b6e9aeea7744ca15594091.tar.gz
Detect jps and pns files as (3D) jpg and png images.
Diffstat (limited to 'libavformat/img2.c')
-rw-r--r--libavformat/img2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c
index 18b9cde230..622d759866 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -54,9 +54,11 @@ typedef struct {
static const IdStrMap img_tags[] = {
{ CODEC_ID_MJPEG , "jpeg"},
{ CODEC_ID_MJPEG , "jpg"},
+ { CODEC_ID_MJPEG , "jps"},
{ CODEC_ID_LJPEG , "ljpg"},
{ CODEC_ID_JPEGLS , "jls"},
{ CODEC_ID_PNG , "png"},
+ { CODEC_ID_PNG , "pns"},
{ CODEC_ID_PNG , "mng"},
{ CODEC_ID_PPM , "ppm"},
{ CODEC_ID_PPM , "pnm"},