Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / sgienc.c

diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c
index f72a32086216e1d7052b96efa7cc6dbad967d27d..d35c7ac5d144e5536ba7a2e3ace424a00aba860d 100644 (file)
--- a/libavcodec/sgienc.c
+++ b/libavcodec/sgienc.c
@@ -113,10 +113,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     else // assume ff_rl_encode() produces at most 2x size of input
         length += tablesize * 2 + depth * height * (2 * width + 1);
 
-    if ((ret = ff_alloc_packet(pkt, length)) < 0) {
-        av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", length);
+    if ((ret = ff_alloc_packet2(avctx, pkt, bytes_per_channel * length)) < 0)
         return ret;
-    }
     buf     = pkt->data;
     end_buf = pkt->data + pkt->size;
 
@@ -214,10 +212,12 @@ AVCodec ff_sgi_encoder = {
     .priv_data_size = sizeof(SgiContext),
     .init           = encode_init,
     .encode2        = encode_frame,
-    .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA,
-                                          PIX_FMT_RGB48LE, PIX_FMT_RGB48BE,
-                                          PIX_FMT_RGBA64LE, PIX_FMT_RGBA64BE,
-                                          PIX_FMT_GRAY16LE, PIX_FMT_GRAY16BE,
-                                          PIX_FMT_GRAY8, PIX_FMT_NONE},
-    .long_name= NULL_IF_CONFIG_SMALL("SGI image"),
+    .pix_fmts       = (const enum PixelFormat[]){
+        PIX_FMT_RGB24, PIX_FMT_RGBA,
+        PIX_FMT_RGB48LE, PIX_FMT_RGB48BE,
+        PIX_FMT_RGBA64LE, PIX_FMT_RGBA64BE,
+        PIX_FMT_GRAY16LE, PIX_FMT_GRAY16BE,
+        PIX_FMT_GRAY8, PIX_FMT_NONE
+    },
+    .long_name      = NULL_IF_CONFIG_SMALL("SGI image"),
 };