Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / zerocodec.c

diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c
index f54abb1c1bc63d523144ab30b19c82ae54d0d8d5..8122cca3b2745bd53b76cd69e7eade93a6045b63 100644 (file)
--- a/libavcodec/zerocodec.c
+++ b/libavcodec/zerocodec.c
@@ -25,7 +25,6 @@
 typedef struct {
     AVFrame  previous_frame;
     z_stream zstream;
-    int      size;
 } ZeroCodecContext;
 
 static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
@@ -49,6 +48,9 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
             av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
             return AVERROR_INVALIDDATA;
         }
+
+        prev += (avctx->height - 1) * prev_pic->linesize[0];
+
         pic->key_frame = 0;
         pic->pict_type = AV_PICTURE_TYPE_P;
     }
@@ -67,7 +69,7 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
     zstream->next_in  = avpkt->data;
     zstream->avail_in = avpkt->size;
 
-    dst = pic->data[0];
+    dst = pic->data[0] + (avctx->height - 1) * pic->linesize[0];
 
     /**
      * ZeroCodec has very simple interframe compression. If a value
@@ -90,8 +92,8 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
             for (j = 0; j < avctx->width << 1; j++)
                 dst[j] += prev[j] & -!dst[j];
 
-        prev += prev_pic->linesize[0];
-        dst  += pic->linesize[0];
+        prev -= prev_pic->linesize[0];
+        dst  -= pic->linesize[0];
     }
 
     /* Release the previous buffer if need be */
@@ -133,9 +135,6 @@ static av_cold int zerocodec_decode_init(AVCodecContext *avctx)
     avctx->pix_fmt             = AV_PIX_FMT_UYVY422;
     avctx->bits_per_raw_sample = 8;
 
-    zc->size = avpicture_get_size(avctx->pix_fmt,
-                                  avctx->width, avctx->height);
-
     zstream->zalloc = Z_NULL;
     zstream->zfree  = Z_NULL;
     zstream->opaque = Z_NULL;