diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-05-14 15:27:26 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-05-31 23:00:30 +0200 |
| commit | aaeef7fa0d6ebb1a3668894e67a70cd5084ce4f4 (patch) | |
| tree | a26f1389d58c98643e98b3b46b25a0fa13535d5b | |
| parent | 2c23237cb4ed963eb5f33d8ef536b3033712e69d (diff) | |
| download | ffmpeg-aaeef7fa0d6ebb1a3668894e67a70cd5084ce4f4.tar.gz | |
mjpegdec: properly report unsupported disabled features
When JPEG-LS support is disabled the decoder would feed the
data to the JPEG Lossless decode_*_scan function resulting in
faulty decoding.
CC: libav-stable@libav.org
(cherry picked from commit b25e49b187617c486ae3f50a5cbb356fc0e868bb)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/mjpegdec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 0b22bca5f3..4956e3a8b7 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1489,6 +1489,12 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, else if (start_code == COM) mjpeg_decode_com(s); + if (!CONFIG_JPEGLS_DECODER && + (start_code == SOF48 || start_code == LSE)) { + av_log(avctx, AV_LOG_ERROR, "JPEG-LS support not enabled.\n"); + return AVERROR(ENOSYS); + } + switch (start_code) { case SOI: s->restart_interval = 0; |