projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
539e727
)
avcodec/mjpegdec: add pix_fmt: 0x14121200
author
Przemysław Sobala
<pszemus@wp-sa.pl>
Tue, 22 Jul 2014 13:52:41 +0000
(15:52 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 22 Jul 2014 16:07:44 +0000
(18:07 +0200)
Fixes: _15801_F.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mjpegdec.c
b/libavcodec/mjpegdec.c
index
1a774dd
..
ea84d9a
100644
(file)
--- 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;