Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / svq1enc.c

diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index a3936a8b3771a924ea14a0394d5a0b4d8781d0ac..35965fb472ffcb4233ab7e9ffbf7a16def952855 100644 (file)
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -505,9 +505,7 @@ static int svq1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     AVFrame temp;
     int i, ret;
 
-    if (!pkt->data &&
-        (ret = av_new_packet(pkt, s->y_block_width*s->y_block_height*MAX_MB_BYTES*3 + FF_MIN_BUFFER_SIZE) < 0)) {
-        av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
+    if ((ret = ff_alloc_packet2(avctx, pkt, s->y_block_width*s->y_block_height*MAX_MB_BYTES*3 + FF_MIN_BUFFER_SIZE) < 0)) {
         return ret;
     }