aacenc: Write correct length for long identification strings.

[ffmpeg] / libavcodec / sgienc.c

diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c
index 787610abda62146a60f8820383fcab4666badb54..9d02eea136d623b576a00deaa876c10fb0dfaf0b 100644 (file)
--- a/libavcodec/sgienc.c
+++ b/libavcodec/sgienc.c
@@ -2,20 +2,20 @@
  * SGI image encoder
  * Todd Kirby <doubleshot@pacbell.net>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -52,7 +52,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
     unsigned char *orig_buf = buf, *end_buf = buf + buf_size;
 
     *p = *(AVFrame*)data;
-    p->pict_type = FF_I_TYPE;
+    p->pict_type = AV_PICTURE_TYPE_I;
     p->key_frame = 1;
 
     width  = avctx->width;
@@ -117,7 +117,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
         buf += tablesize;
 
         /* Make an intermediate consecutive buffer. */
-        if ((encode_buf = av_malloc(width)) == NULL)
+        if (!(encode_buf = av_malloc(width)))
             return -1;
 
         for (z = 0; z < depth; z++) {
@@ -142,31 +142,30 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
         }
 
         av_free(encode_buf);
-        } else {
-            for (z = 0; z < depth; z++) {
-                in_buf = p->data[0] + p->linesize[0] * (height - 1) + z;
+    } else {
+        for (z = 0; z < depth; z++) {
+            in_buf = p->data[0] + p->linesize[0] * (height - 1) + z;
 
-                for (y = 0; y < height; y++) {
-                    for (x = 0; x < width * depth; x += depth)
-                        bytestream_put_byte(&buf, in_buf[x]);
+            for (y = 0; y < height; y++) {
+                for (x = 0; x < width * depth; x += depth)
+                    bytestream_put_byte(&buf, in_buf[x]);
 
-                    in_buf -= p->linesize[0];
-                }
+                in_buf -= p->linesize[0];
             }
         }
+    }
 
     /* total length */
     return buf - orig_buf;
 }
 
-AVCodec sgi_encoder = {
-    "sgi",
-    CODEC_TYPE_VIDEO,
-    CODEC_ID_SGI,
-    sizeof(SgiContext),
-    encode_init,
-    encode_frame,
-    NULL,
+AVCodec ff_sgi_encoder = {
+    .name           = "sgi",
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = CODEC_ID_SGI,
+    .priv_data_size = sizeof(SgiContext),
+    .init           = encode_init,
+    .encode         = encode_frame,
     .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA, PIX_FMT_GRAY8, PIX_FMT_NONE},
     .long_name= NULL_IF_CONFIG_SMALL("SGI image"),
 };