diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-17 03:13:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-21 16:47:49 +0100 |
| commit | 17c54e93176b8d1b39de3d4e892df9befeb07b73 (patch) | |
| tree | b8cd37800c961e266adb7ada64f9017fea58756f | |
| parent | 14d4eee547c9fb7a2593829201f139c754ad62ba (diff) | |
| download | ffmpeg-17c54e93176b8d1b39de3d4e892df9befeb07b73.tar.gz | |
mjpeg: support mpo
Fixes stereoscopic_photo.mpo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1d23e5246c67f765dd5d119c9f3197bdae07330c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rawdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index d4383d5b49..76e05237ca 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 |