diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 22:11:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-21 12:56:12 +0200 |
| commit | b60a65ee2d5da38faf8a439a86096ea9776493b4 (patch) | |
| tree | 6cac572048e59a02991fa779ed85df1c16414ef2 /libavcodec/mjpegdec.c | |
| parent | a90baa63c33fbba3d79f5c119fd4c7fad722d701 (diff) | |
| download | android_external_ffmpeg-b60a65ee2d5da38faf8a439a86096ea9776493b4.tar.gz android_external_ffmpeg-b60a65ee2d5da38faf8a439a86096ea9776493b4.tar.bz2 android_external_ffmpeg-b60a65ee2d5da38faf8a439a86096ea9776493b4.zip | |
mjpegdec: fix AV_PIX_FMT_YUVJ411P handling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index ea90f1df76..ef8e1c6ba2 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -428,7 +428,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; break; case 0x41111100: - s->avctx->pix_fmt = AV_PIX_FMT_YUV411P; + s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV411P : AV_PIX_FMT_YUVJ411P; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; break; default: |