lavc: document that avcodec_close() should not be used

[ffmpeg] / libavcodec / dvbsub_parser.c

diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c
index 8f3b0653d4f3e3ccea295a67a20f10c4a5147405..2e7d8c2aee86abbf6c67577aae8a3a77cac78731 100644 (file)
--- a/libavcodec/dvbsub_parser.c
+++ b/libavcodec/dvbsub_parser.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
+#include "internal.h"
 
 /* Parser (mostly) copied from dvdsub.c */
 
@@ -52,18 +52,18 @@ static int dvbsub_parse(AVCodecParserContext *s,
     uint8_t *p, *p_end;
     int i, len, buf_pos = 0;
 
-    av_dlog(avctx, "DVB parse packet pts=%"PRIx64", lpts=%"PRIx64", cpts=%"PRIx64":\n",
+    ff_dlog(avctx, "DVB parse packet pts=%"PRIx64", lpts=%"PRIx64", cpts=%"PRIx64":\n",
             s->pts, s->last_pts, s->cur_frame_pts[s->cur_frame_start_index]);
 
     for (i=0; i < buf_size; i++)
     {
-        av_dlog(avctx, "%02x ", buf[i]);
+        ff_dlog(avctx, "%02x ", buf[i]);
         if (i % 16 == 15)
-            av_dlog(avctx, "\n");
+            ff_dlog(avctx, "\n");
     }
 
     if (i % 16 != 0)
-        av_dlog(avctx, "\n");
+        ff_dlog(avctx, "\n");
 
     *poutbuf = NULL;
     *poutbuf_size = 0;
@@ -74,7 +74,7 @@ static int dvbsub_parse(AVCodecParserContext *s,
     {
         if (pc->packet_index != pc->packet_start)
         {
-            av_dlog(avctx, "Discarding %d bytes\n",
+            ff_dlog(avctx, "Discarding %d bytes\n",
                     pc->packet_index - pc->packet_start);
         }
 
@@ -82,7 +82,7 @@ static int dvbsub_parse(AVCodecParserContext *s,
         pc->packet_index = 0;
 
         if (buf_size < 2 || buf[0] != 0x20 || buf[1] != 0x00) {
-            av_dlog(avctx, "Bad packet header\n");
+            ff_dlog(avctx, "Bad packet header\n");
             return -1;
         }
 
@@ -139,7 +139,7 @@ static int dvbsub_parse(AVCodecParserContext *s,
         } else if (*p == 0xff) {
             if (p + 1 < p_end)
             {
-                av_dlog(avctx, "Junk at end of packet\n");
+                ff_dlog(avctx, "Junk at end of packet\n");
             }
             pc->packet_index = p - pc->packet_buf;
             pc->in_packet = 0;
@@ -172,9 +172,9 @@ static av_cold void dvbsub_parse_close(AVCodecParserContext *s)
 }
 
 AVCodecParser ff_dvbsub_parser = {
-    { CODEC_ID_DVB_SUBTITLE },
-    sizeof(DVBSubParseContext),
-    dvbsub_parse_init,
-    dvbsub_parse,
-    dvbsub_parse_close,
+    .codec_ids      = { AV_CODEC_ID_DVB_SUBTITLE },
+    .priv_data_size = sizeof(DVBSubParseContext),
+    .parser_init    = dvbsub_parse_init,
+    .parser_parse   = dvbsub_parse,
+    .parser_close   = dvbsub_parse_close,
 };