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/wmadec.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/wmadec.c')
-rw-r--r-- | libavcodec/wmadec.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index ffbf511adc..d60cf1febb 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -53,16 +53,16 @@ static void dump_floats(WMACodecContext *s, const char *name, { int i; - tprintf(s->avctx, "%s[%d]:\n", name, n); + ff_tlog(s->avctx, "%s[%d]:\n", name, n); for (i = 0; i < n; i++) { if ((i & 7) == 0) - tprintf(s->avctx, "%4d: ", i); - tprintf(s->avctx, " %8.*f", prec, tab[i]); + ff_tlog(s->avctx, "%4d: ", i); + ff_tlog(s->avctx, " %8.*f", prec, tab[i]); if ((i & 7) == 7) - tprintf(s->avctx, "\n"); + ff_tlog(s->avctx, "\n"); } if ((i & 7) != 0) - tprintf(s->avctx, "\n"); + ff_tlog(s->avctx, "\n"); } #endif /* TRACE */ @@ -436,7 +436,7 @@ static int wma_decode_block(WMACodecContext *s) FFTContext *mdct; #ifdef TRACE - tprintf(s->avctx, "***decode_block: %d:%d\n", + ff_tlog(s->avctx, "***decode_block: %d:%d\n", s->frame_count - 1, s->block_num); #endif /* TRACE */ @@ -657,7 +657,7 @@ static int wma_decode_block(WMACodecContext *s) } exp_power[j] = e2 / n; last_high_band = j; - tprintf(s->avctx, "%d: power=%f (%d)\n", j, exp_power[j], n); + ff_tlog(s->avctx, "%d: power=%f (%d)\n", j, exp_power[j], n); } exponents += n << bsize >> esize; } @@ -730,7 +730,7 @@ static int wma_decode_block(WMACodecContext *s) /* no need to optimize this case because it should almost * never happen */ if (!s->channel_coded[0]) { - tprintf(s->avctx, "rare ms-stereo case happened\n"); + ff_tlog(s->avctx, "rare ms-stereo case happened\n"); memset(s->coefs[0], 0, sizeof(float) * s->block_len); s->channel_coded[0] = 1; } @@ -771,7 +771,7 @@ static int wma_decode_frame(WMACodecContext *s, float **samples, int ret, ch; #ifdef TRACE - tprintf(s->avctx, "***decode_frame: %d size=%d\n", + ff_tlog(s->avctx, "***decode_frame: %d size=%d\n", s->frame_count++, s->frame_len); #endif /* TRACE */ @@ -815,7 +815,7 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, float **samples; int samples_offset; - tprintf(avctx, "***decode_superframe:\n"); + ff_tlog(avctx, "***decode_superframe:\n"); if (buf_size == 0) { s->last_superframe_len = 0; @@ -944,7 +944,7 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, samples_offset += s->frame_len; } - av_dlog(s->avctx, "%d %d %d %d outbytes:%"PTRDIFF_SPECIFIER" eaten:%d\n", + ff_dlog(s->avctx, "%d %d %d %d outbytes:%"PTRDIFF_SPECIFIER" eaten:%d\n", s->frame_len_bits, s->block_len_bits, s->frame_len, s->block_len, (int8_t *) samples - (int8_t *) data, avctx->block_align); |