aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-09 21:31:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-09 21:40:13 +0100
commitebfa1264aacf74291d20cc5d6c23e0618b5c5144 (patch)
treec794dba37ebe796c169bf3f0246657ea71e5e7f9
parent7c3700cd1d8683966b21fffbf02e326d0bd14e06 (diff)
downloadffmpeg-ebfa1264aacf74291d20cc5d6c23e0618b5c5144.tar.gz
avcodec/mjpegdec: allow lowres with amv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mjpegdec.c5
-rw-r--r--libavcodec/sp5xdec.c1
2 files changed, 1 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++) {
diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c
index 81f3c24a09..7496198420 100644
--- a/libavcodec/sp5xdec.c
+++ b/libavcodec/sp5xdec.c
@@ -117,5 +117,6 @@ AVCodec ff_amv_decoder = {
.init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end,
.decode = sp5x_decode_frame,
+ .max_lowres = 3,
};
#endif