Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / dvbsub_parser.c

diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c
index 96381df10ea29d1f4e7b50540df7993eac25c265..6ecd44af13bec74e41695d77076e69de8a28e056 100644 (file)
--- a/libavcodec/dvbsub_parser.c
+++ b/libavcodec/dvbsub_parser.c
@@ -20,7 +20,7 @@
  */
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 //#define DEBUG
 //#define DEBUG_PACKET_CONTENTS
@@ -55,10 +55,8 @@ static int dvbsub_parse(AVCodecParserContext *s,
     uint8_t *p, *p_end;
     int len, buf_pos = 0;
 
-#ifdef DEBUG
-    av_log(avctx, AV_LOG_INFO, "DVB parse packet pts=%"PRIx64", lpts=%"PRIx64", cpts=%"PRIx64":\n",
+    av_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]);
-#endif
 
 #ifdef DEBUG_PACKET_CONTENTS
     int i;
@@ -84,19 +82,15 @@ static int dvbsub_parse(AVCodecParserContext *s,
     {
         if (pc->packet_index != pc->packet_start)
         {
-#ifdef DEBUG
-            av_log(avctx, AV_LOG_INFO, "Discarding %d bytes\n",
-                pc->packet_index - pc->packet_start);
-#endif
+            av_dlog(avctx, "Discarding %d bytes\n",
+                    pc->packet_index - pc->packet_start);
         }
 
         pc->packet_start = 0;
         pc->packet_index = 0;
 
         if (buf_size < 2 || buf[0] != 0x20 || buf[1] != 0x00) {
-#ifdef DEBUG
-            av_log(avctx, AV_LOG_INFO, "Bad packet header\n");
-#endif
+            av_dlog(avctx, "Bad packet header\n");
             return -1;
         }
 
@@ -153,9 +147,7 @@ static int dvbsub_parse(AVCodecParserContext *s,
         } else if (*p == 0xff) {
             if (p + 1 < p_end)
             {
-#ifdef DEBUG
-                av_log(avctx, AV_LOG_INFO, "Junk at end of packet\n");
-#endif
+                av_dlog(avctx, "Junk at end of packet\n");
             }
             pc->packet_index = p - pc->packet_buf;
             pc->in_packet = 0;
@@ -187,7 +179,7 @@ static av_cold void dvbsub_parse_close(AVCodecParserContext *s)
     av_freep(&pc->packet_buf);
 }
 
-AVCodecParser dvbsub_parser = {
+AVCodecParser ff_dvbsub_parser = {
     { CODEC_ID_DVB_SUBTITLE },
     sizeof(DVBSubParseContext),
     dvbsub_parse_init,