diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 21:31:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 21:40:13 +0100 |
| commit | ebfa1264aacf74291d20cc5d6c23e0618b5c5144 (patch) | |
| tree | c794dba37ebe796c169bf3f0246657ea71e5e7f9 /libavcodec/mjpegdec.c | |
| parent | 7c3700cd1d8683966b21fffbf02e326d0bd14e06 (diff) | |
| download | ffmpeg-ebfa1264aacf74291d20cc5d6c23e0618b5c5144.tar.gz | |
avcodec/mjpegdec: allow lowres with amv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 676f741af4..d1ede3e2eb 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1112,11 +1112,6 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, if (mb_bitmask) init_get_bits(&mb_bitmask_gb, mb_bitmask, s->mb_width * s->mb_height); - if (s->flipped && s->avctx->lowres) { - av_log(s->avctx, AV_LOG_ERROR, "Can not flip image with lowres\n"); - s->flipped = 0; - } - s->restart_count = 0; for (i = 0; i < nb_components; i++) { |