[FFmpeg-cvslog] avcodec/mjpegdec: add pix_fmt: 0x14121200

Przemysław Sobala git at videolan.org
Tue Jul 22 18:08:28 CEST 2014


ffmpeg | branch: master | Przemysław Sobala <pszemus at wp-sa.pl> | Tue Jul 22 15:52:41 2014 +0200| [c68098ba4a1456e5e17ae6435db7487c64890934] | committer: Michael Niedermayer

avcodec/mjpegdec: add pix_fmt: 0x14121200

Fixes: _15801_F.jpg

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

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

 libavcodec/mjpegdec.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 1a774dd..ea84d9a 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -485,6 +485,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
             s->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
         break;
     case 0x12111100:
+    case 0x14121200:
     case 0x22211100:
     case 0x22112100:
         if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV440P : AV_PIX_FMT_YUVJ440P;



More information about the ffmpeg-cvslog mailing list