[FFmpeg-cvslog] avcodec/mjpegdec: allow lowres with amv

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  9 21:31:46 2014 +0100| [ebfa1264aacf74291d20cc5d6c23e0618b5c5144] | committer: Michael Niedermayer

avcodec/mjpegdec: allow lowres with amv

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

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

 libavcodec/mjpegdec.c |    5 -----
 libavcodec/sp5xdec.c  |    1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 676f741..d1ede3e 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 81f3c24..7496198 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