diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-03-16 08:57:36 +0000 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-04-19 12:41:59 +0100 |
| commit | 6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25 (patch) | |
| tree | e7c2aefd4766229b73aef86bf3312563f70a658c /libavcodec/h264_cavlc.c | |
| parent | 1a3eb042c704dea190c644def5b32c9cee8832b8 (diff) | |
lavc: Replace av_dlog and tprintf with internal macros
Diffstat (limited to 'libavcodec/h264_cavlc.c')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 0a7dca2225..7445788e56 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -292,7 +292,7 @@ static inline int pred_non_zero_count(const H264Context *h, H264SliceContext *sl if(i<64) i= (i+1)>>1; - tprintf(h->avctx, "pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31); + ff_tlog(h->avctx, "pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31); return i&31; } @@ -482,7 +482,7 @@ static int decode_residual(const H264Context *h, H264SliceContext *sl, } trailing_ones= coeff_token&3; - tprintf(h->avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff); + ff_tlog(h->avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff); assert(total_coeff<=16); i = show_bits(gb, 3); @@ -710,7 +710,7 @@ int ff_h264_decode_mb_cavlc(const H264Context *h, H264SliceContext *sl) mb_xy = sl->mb_xy = sl->mb_x + sl->mb_y*h->mb_stride; - tprintf(h->avctx, "pic:%d mb:%d/%d\n", h->frame_num, sl->mb_x, sl->mb_y); + ff_tlog(h->avctx, "pic:%d mb:%d/%d\n", h->frame_num, sl->mb_x, sl->mb_y); cbp = 0; /* avoid warning. FIXME: find a solution without slowing down the code */ if (sl->slice_type_nos != AV_PICTURE_TYPE_I) { @@ -916,7 +916,7 @@ decode_intra_mb: pred_motion(h, sl, index, block_width, list, sl->ref_cache[list][ scan8[index] ], &mx, &my); mx += get_se_golomb(&sl->gb); my += get_se_golomb(&sl->gb); - tprintf(h->avctx, "final mv:%d %d\n", mx, my); + ff_tlog(h->avctx, "final mv:%d %d\n", mx, my); if(IS_SUB_8X8(sub_mb_type)){ mv_cache[ 1 ][0]= @@ -970,7 +970,7 @@ decode_intra_mb: pred_motion(h, sl, 0, 4, list, sl->ref_cache[list][ scan8[0] ], &mx, &my); mx += get_se_golomb(&sl->gb); my += get_se_golomb(&sl->gb); - tprintf(h->avctx, "final mv:%d %d\n", mx, my); + ff_tlog(h->avctx, "final mv:%d %d\n", mx, my); fill_rectangle(sl->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); } @@ -1005,7 +1005,7 @@ decode_intra_mb: pred_16x8_motion(h, sl, 8*i, list, sl->ref_cache[list][scan8[0] + 16*i], &mx, &my); mx += get_se_golomb(&sl->gb); my += get_se_golomb(&sl->gb); - tprintf(h->avctx, "final mv:%d %d\n", mx, my); + ff_tlog(h->avctx, "final mv:%d %d\n", mx, my); val= pack16to32(mx,my); }else @@ -1043,7 +1043,7 @@ decode_intra_mb: pred_8x16_motion(h, sl, i*4, list, sl->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); mx += get_se_golomb(&sl->gb); my += get_se_golomb(&sl->gb); - tprintf(h->avctx, "final mv:%d %d\n", mx, my); + ff_tlog(h->avctx, "final mv:%d %d\n", mx, my); val= pack16to32(mx,my); }else |