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/rv10.c | |
parent | 40d552dae657d2d690a724c8b1e7ea714998d74f (diff) | |
parent | 6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25 (diff) | |
download | ffmpeg-8f7b022c8c2f40bf8ddfd90778a4c91424d3a8e5.tar.gz |
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/rv10.c')
-rw-r--r-- | libavcodec/rv10.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 7097b29d5e..4fde24df26 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -258,7 +258,7 @@ static int rv10_decode_picture_header(MpegEncContext *s) pb_frame = get_bits1(&s->gb); - av_dlog(s->avctx, "pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame); + ff_dlog(s->avctx, "pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame); if (pb_frame) { avpriv_request_sample(s->avctx, "pb frame"); @@ -277,7 +277,7 @@ static int rv10_decode_picture_header(MpegEncContext *s) s->last_dc[0] = get_bits(&s->gb, 8); s->last_dc[1] = get_bits(&s->gb, 8); s->last_dc[2] = get_bits(&s->gb, 8); - av_dlog(s->avctx, "DC:%d %d %d\n", s->last_dc[0], + ff_dlog(s->avctx, "DC:%d %d %d\n", s->last_dc[0], s->last_dc[1], s->last_dc[2]); } } @@ -594,7 +594,7 @@ static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf, } - av_dlog(avctx, "qscale=%d\n", s->qscale); + ff_dlog(avctx, "qscale=%d\n", s->qscale); /* default quantization values */ if (s->codec_id == AV_CODEC_ID_RV10) { @@ -634,7 +634,7 @@ static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf, for (s->mb_num_left = mb_count; s->mb_num_left > 0; s->mb_num_left--) { int ret; ff_update_block_index(s); - av_dlog(avctx, "**mb x=%d y=%d\n", s->mb_x, s->mb_y); + ff_dlog(avctx, "**mb x=%d y=%d\n", s->mb_x, s->mb_y); s->mv_dir = MV_DIR_FORWARD; s->mv_type = MV_TYPE_16X16; @@ -706,7 +706,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int slice_count; const uint8_t *slices_hdr = NULL; - av_dlog(avctx, "*****frame %d size=%d\n", avctx->frame_number, buf_size); + ff_dlog(avctx, "*****frame %d size=%d\n", avctx->frame_number, buf_size); s->flags = avctx->flags; s->flags2 = avctx->flags2; |