aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-07-28 17:02:22 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-07-28 17:13:01 +0200
commitae4dc0b37aa8aee5f7bca294d1da2a22ff3db68d (patch)
treeaab1f33311b88886981ebb2cc3061781b4535515
parent8a09195545029672470e44a0f5c6bc6c86fb2ed5 (diff)
downloadffmpeg-ae4dc0b37aa8aee5f7bca294d1da2a22ff3db68d.tar.gz
Set bits_per_raw_sample when decoding mjpeg / ljpeg.
The ljpeg decoder also supports gray images with 8 - 15 bits per component.
-rw-r--r--libavcodec/mjpegdec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 37a5414b44..c92738f727 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -221,6 +221,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
/* XXX: verify len field validity */
len = get_bits(&s->gb, 16);
+ s->avctx->bits_per_raw_sample =
s->bits = get_bits(&s->gb, 8);
if (s->pegasus_rct)