From 6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 16 Mar 2015 08:57:36 +0000 Subject: lavc: Replace av_dlog and tprintf with internal macros --- libavcodec/dvbsub_parser.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'libavcodec/dvbsub_parser.c') diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c index 295e03bb18..2e7d8c2aee 100644 --- a/libavcodec/dvbsub_parser.c +++ b/libavcodec/dvbsub_parser.c @@ -20,6 +20,7 @@ */ #include "avcodec.h" #include "get_bits.h" +#include "internal.h" /* Parser (mostly) copied from dvdsub.c */ @@ -51,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; @@ -73,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); } @@ -81,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; } @@ -138,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; -- cgit v1.2.3