diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 04:34:22 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:10:10 +0300 |
commit | 8f7b022c8c2f40bf8ddfd90778a4c91424d3a8e5 (patch) | |
tree | 2bc0615cc0d4a8ad47932dae2be2b6c3c1a82f9e /libavcodec/h264_refs.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/h264_refs.c')
-rw-r--r-- | libavcodec/h264_refs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 8e3c21455d..c424b9e3a2 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -174,14 +174,14 @@ int ff_h264_fill_default_ref_list(H264Context *h, H264SliceContext *sl) } #ifdef TRACE for (i = 0; i < sl->ref_count[0]; i++) { - tprintf(h->avctx, "List0: %s fn:%d 0x%p\n", + ff_tlog(h->avctx, "List0: %s fn:%d 0x%p\n", h->default_ref_list[0][i].parent ? (h->default_ref_list[0][i].parent->long_ref ? "LT" : "ST") : "NULL", h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].parent ? h->default_ref_list[0][i].parent->f.data[0] : 0); } if (sl->slice_type_nos == AV_PICTURE_TYPE_B) { for (i = 0; i < sl->ref_count[1]; i++) { - tprintf(h->avctx, "List1: %s fn:%d 0x%p\n", + ff_tlog(h->avctx, "List1: %s fn:%d 0x%p\n", h->default_ref_list[1][i].parent ? (h->default_ref_list[1][i].parent->long_ref ? "LT" : "ST") : "NULL", h->default_ref_list[1][i].pic_id, h->default_ref_list[1][i].parent ? h->default_ref_list[1][i].parent->f.data[0] : 0); |