Merge commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7'

[ffmpeg] / libavcodec / avuienc.c

diff --git a/libavcodec/avuienc.c b/libavcodec/avuienc.c
index b91f7829559b89cbaf1a95517b5b5326ddf200d9..b32f433b2959c4070079a0bd447fdd45fb568632 100644 (file)
--- a/libavcodec/avuienc.c
+++ b/libavcodec/avuienc.c
@@ -67,10 +67,11 @@ static int avui_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         skip = 16;
     }
     size = 2 * avctx->width * (avctx->height + skip) + 8 * interlaced;
-    if ((ret = ff_alloc_packet2(avctx, pkt, size)) < 0)
+    if ((ret = ff_alloc_packet(pkt, size)) < 0)
         return ret;
     dst = pkt->data;
     if (!interlaced) {
+        memset(dst, 0, avctx->width * skip);
         dst += avctx->width * skip;
     }
 
@@ -84,6 +85,7 @@ static int avui_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         } else {
             src = pic->data[0] + i * pic->linesize[0];
         }
+        memset(dst, 0, avctx->width * skip + 4 * i);
         dst += avctx->width * skip + 4 * i;
         for (j = 0; j < avctx->height; j += interlaced + 1) {
             memcpy(dst, src, avctx->width * 2);