[FFmpeg-cvslog] ljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.

[Michael Niedermayer]

ffmpeg | branch: release/0.9 | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 14 22:48:30 2011 +0100| [de69052b1a75feb597b01d0d192d07833ebddef4] | committer: Michael Niedermayer

ljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.

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

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

 libavcodec/mjpegdec.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 5a51201..b3b02da 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);