remove useless wrapper func

[ffmpeg] / libavcodec / xsubdec.c

diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c
index e877db41bc7cb012bd77b892ec2eb178ef5370c6..d9740c09fba23a677e84b8056c9916eb63c316d1 100644 (file)
--- a/libavcodec/xsubdec.c
+++ b/libavcodec/xsubdec.c
@@ -1,8 +1,28 @@
+/*
+ * XSUB subtitle decoder
+ * Copyright (c) 2007 Reimar Döffinger
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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,
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 #include "avcodec.h"
 #include "bitstream.h"
 #include "bytestream.h"
 
-static int decode_init(AVCodecContext *avctx) {
+static av_cold int decode_init(AVCodecContext *avctx) {
     avctx->pix_fmt = PIX_FMT_PAL8;
     return 0;
 }
@@ -10,7 +30,7 @@ static int decode_init(AVCodecContext *avctx) {
 static const uint8_t tc_offsets[9] = { 0, 1, 3, 4, 6, 7, 9, 10, 11 };
 static const uint8_t tc_muls[9] = { 10, 6, 10, 6, 10, 6, 10, 10, 1 };
 
-static uint64_t parse_timecode(uint8_t *buf) {
+static uint64_t parse_timecode(const uint8_t *buf) {
     int i;
     int64_t ms = 0;
     if (buf[2] != ':' || buf[5] != ':' || buf[8] != '.')
@@ -24,9 +44,9 @@ static uint64_t parse_timecode(uint8_t *buf) {
 }
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
-                        uint8_t *buf, int buf_size) {
+                        const uint8_t *buf, int buf_size) {
     AVSubtitle *sub = data;
-    uint8_t *buf_end = buf + buf_size;
+    const uint8_t *buf_end = buf + buf_size;
     uint8_t *bitmap;
     int w, h, x, y, rlelen, i;
     GetBitContext gb;
@@ -88,11 +108,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         for (x = 0; x < w; ) {
             int log2 = ff_log2_tab[show_bits(&gb, 8)];
             int run = get_bits(&gb, 14 - 4 * (log2 >> 1));
-            int colour = get_bits(&gb, 2);
+            int color = get_bits(&gb, 2);
             run = FFMIN(run, w - x);
             // run length 0 means till end of row
             if (!run) run = w - x;
-            memset(bitmap, colour, run);
+            memset(bitmap, color, run);
             bitmap += run;
             x += run;
         }
@@ -113,4 +133,5 @@ AVCodec xsub_decoder = {
     NULL,
     NULL,
     decode_frame,
+    .long_name = "XSUB",
 };