diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 03:34:22 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 04:10:10 +0200 |
commit | 8f7b022c8c2f40bf8ddfd90778a4c91424d3a8e5 (patch) | |
tree | 2bc0615cc0d4a8ad47932dae2be2b6c3c1a82f9e /libavcodec/pgssubdec.c | |
parent | 40d552dae657d2d690a724c8b1e7ea714998d74f (diff) | |
parent | 6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25 (diff) |
Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25':
lavc: Replace av_dlog and tprintf with internal macros
Conflicts:
libavcodec/aacdec.c
libavcodec/audio_frame_queue.c
libavcodec/bitstream.c
libavcodec/dcadec.c
libavcodec/dnxhddec.c
libavcodec/dvbsubdec.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/get_bits.h
libavcodec/gifdec.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
libavcodec/imc.c
libavcodec/interplayvideo.c
libavcodec/jpeglsdec.c
libavcodec/libopencore-amr.c
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_parser.c
libavcodec/pngdec.c
libavcodec/ratecontrol.c
libavcodec/rv10.c
libavcodec/svq1dec.c
libavcodec/vqavideo.c
libavcodec/wmadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pgssubdec.c')
-rw-r--r-- | libavcodec/pgssubdec.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 2bee31540e..0d307f5302 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -213,7 +213,7 @@ static int decode_rle(AVCodecContext *avctx, AVSubtitleRect *rect, return AVERROR_INVALIDDATA; } - av_dlog(avctx, "Pixel Count = %d, Area = %d\n", pixel_count, rect->w * rect->h); + ff_dlog(avctx, "Pixel Count = %d, Area = %d\n", pixel_count, rect->w * rect->h); return 0; } @@ -357,7 +357,7 @@ static int parse_palette_segment(AVCodecContext *avctx, YUV_TO_RGB1(cb, cr); YUV_TO_RGB2(r, g, b, y); - av_dlog(avctx, "Color %d := (%d,%d,%d,%d)\n", color_id, r, g, b, alpha); + ff_dlog(avctx, "Color %d := (%d,%d,%d,%d)\n", color_id, r, g, b, alpha); /* Store color in palette */ palette->clut[color_id] = RGBA(r,g,b,alpha); @@ -390,7 +390,7 @@ static int parse_presentation_segment(AVCodecContext *avctx, ctx->presentation.pts = pts; - av_dlog(avctx, "Video Dimensions %dx%d\n", + ff_dlog(avctx, "Video Dimensions %dx%d\n", w, h); ret = ff_set_dimensions(avctx, w, h); if (ret < 0) @@ -456,7 +456,7 @@ static int parse_presentation_segment(AVCodecContext *avctx, ctx->presentation.objects[i].crop_h = bytestream_get_be16(&buf); } - av_dlog(avctx, "Subtitle Placement x=%d, y=%d\n", + ff_dlog(avctx, "Subtitle Placement x=%d, y=%d\n", ctx->presentation.objects[i].x, ctx->presentation.objects[i].y); if (ctx->presentation.objects[i].x > avctx->width || @@ -602,16 +602,16 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, int segment_length; int i, ret; - av_dlog(avctx, "PGS sub packet:\n"); + ff_dlog(avctx, "PGS sub packet:\n"); 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 & 15) - av_dlog(avctx, "\n"); + ff_dlog(avctx, "\n"); *data_size = 0; @@ -626,7 +626,7 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, segment_type = bytestream_get_byte(&buf); segment_length = bytestream_get_be16(&buf); - av_dlog(avctx, "Segment Length %d, Segment Type %x\n", segment_length, segment_type); + ff_dlog(avctx, "Segment Length %d, Segment Type %x\n", segment_length, segment_type); if (segment_type != DISPLAY_SEGMENT && segment_length > buf_end - buf) break; |