lavc: remove disabled FF_API_COLOR_TABLE_ID cruft

[ffmpeg] / libavcodec / dvdsubenc.c

diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index 4dc58e7bde60310aa04342bf51c2835c0858752d..5e362b7f64b8146e508c561d92dde382f4212998 100644 (file)
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -1,21 +1,21 @@
 /*
- * DVD subtitle encoding for ffmpeg
+ * DVD subtitle encoding
  * Copyright (c) 2005 Wolfram Gloger
  *
- * 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
  */
 #include "avcodec.h"
@@ -205,22 +205,20 @@ static int encode_dvd_subtitles(uint8_t *outbuf, int outbuf_size,
 }
 
 static int dvdsub_encode(AVCodecContext *avctx,
-                         unsigned char *buf, int buf_size, void *data)
+                         unsigned char *buf, int buf_size,
+                         const AVSubtitle *sub)
 {
     //DVDSubtitleContext *s = avctx->priv_data;
-    AVSubtitle *sub = data;
     int ret;
 
     ret = encode_dvd_subtitles(buf, buf_size, sub);
     return ret;
 }
 
-AVCodec dvdsub_encoder = {
-    "dvdsub",
-    CODEC_TYPE_SUBTITLE,
-    CODEC_ID_DVD_SUBTITLE,
-    0,
-    NULL,
-    dvdsub_encode,
-    .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
+AVCodec ff_dvdsub_encoder = {
+    .name           = "dvdsub",
+    .type           = AVMEDIA_TYPE_SUBTITLE,
+    .id             = AV_CODEC_ID_DVD_SUBTITLE,
+    .encode_sub     = dvdsub_encode,
+    .long_name      = NULL_IF_CONFIG_SMALL("DVD subtitles"),
 };