aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-17 03:13:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-17 03:13:50 +0100
commit1d23e5246c67f765dd5d119c9f3197bdae07330c (patch)
tree19c02d37fc48f5bb7a9ffb26ab530f83b9ba6983
parent8709ba907a7f6f44e392161221d9628fa74b22f6 (diff)
downloadffmpeg-1d23e5246c67f765dd5d119c9f3197bdae07330c.tar.gz
mjpeg: support mpo
Fixes stereoscopic_photo.mpo Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/rawdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index d497f12e64..e48b4f24a3 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -206,7 +206,7 @@ AVInputFormat ff_latm_demuxer = {
#endif
#if CONFIG_MJPEG_DEMUXER
-FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg", CODEC_ID_MJPEG)
+FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg,mpo", CODEC_ID_MJPEG)
#endif
#if CONFIG_MLP_DEMUXER