From: Martin Lambers <marlam@marlam.de>
Date: Wed, 16 Oct 2013 15:37:02 +0000 (+0200)
Subject: img2: add stereo 3d still picture file extensions
X-Git-Tag: android-x86-6.0-r1~10^2~2522
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a;p=android-x86%2Fexternal-ffmpeg.git

img2: add stereo 3d still picture file extensions
---

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 3b49a32391..493df6d77e 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -31,8 +31,11 @@ typedef struct {
 static const IdStrMap img_tags[] = {
     { AV_CODEC_ID_MJPEG,      "jpeg"     },
     { AV_CODEC_ID_MJPEG,      "jpg"      },
+    { AV_CODEC_ID_MJPEG,      "jps"      },
+    { AV_CODEC_ID_MJPEG,      "mpo"      },
     { AV_CODEC_ID_LJPEG,      "ljpg"     },
     { AV_CODEC_ID_PNG,        "png"      },
+    { AV_CODEC_ID_PNG,        "pns"      },
     { AV_CODEC_ID_PNG,        "mng"      },
     { AV_CODEC_ID_PPM,        "ppm"      },
     { AV_CODEC_ID_PPM,        "pnm"      },