Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / sunrastenc.c

diff --git a/libavcodec/sunrastenc.c b/libavcodec/sunrastenc.c
index 6aae3539832436aa05293dbd121312d854ef0e7f..5961a06960f0f13ca1c8a2b523b7c2c4c8c0cb39 100644 (file)
--- a/libavcodec/sunrastenc.c
+++ b/libavcodec/sunrastenc.c
@@ -84,7 +84,6 @@ static void sunrast_image_write_image(AVCodecContext *avctx,
         uint8_t value, value2;
         int run;
 
-        y = 0;
         ptr = pixels;
 
 #define GET_VALUE y >= avctx->height ? 0 : x >= len ? ptr[len-1] : ptr[x]
@@ -185,7 +184,7 @@ static int sunrast_encode_frame(AVCodecContext *avctx,  AVPacket *avpkt,
     SUNRASTContext *s = avctx->priv_data;
     int ret;
 
-    if ((ret = ff_alloc_packet(avpkt, s->size)) < 0)
+    if ((ret = ff_alloc_packet2(avctx, avpkt, s->size)) < 0)
         return ret;
 
     bytestream2_init_writer(&s->p, avpkt->data, avpkt->size);