aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-14 22:48:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-16 15:21:19 +0100
commitde69052b1a75feb597b01d0d192d07833ebddef4 (patch)
tree783b28f263c4d7e3b98254403590d03a5d258cab
parentbf928ebed2c5569e20ccbe4d44b66a41f532f316 (diff)
downloadffmpeg-de69052b1a75feb597b01d0d192d07833ebddef4.tar.gz
ljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mjpegdec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 5a51201d9d..b3b02daab6 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -233,6 +233,11 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
return -1;
}
+ if(s->lossless && s->avctx->lowres){
+ av_log(s->avctx, AV_LOG_ERROR, "lowres is not possible with lossless jpeg\n");
+ return -1;
+ }
+
height = get_bits(&s->gb, 16);
width = get_bits(&s->gb, 16);