[FFmpeg-cvslog] mjpeg: support mpo

Michael Niedermayer git at videolan.org
Tue Nov 22 02:38:12 CET 2011


ffmpeg | branch: oldabi | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 17 03:13:50 2011 +0100| [17c54e93176b8d1b39de3d4e892df9befeb07b73] | committer: Michael Niedermayer

mjpeg: support mpo
Fixes stereoscopic_photo.mpo

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 1d23e5246c67f765dd5d119c9f3197bdae07330c)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17c54e93176b8d1b39de3d4e892df9befeb07b73
---

 libavformat/rawdec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index d4383d5..76e0523 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -252,7 +252,7 @@ AVInputFormat ff_gsm_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



More information about the ffmpeg-cvslog mailing list