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/wma.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/wma.c')
| -rw-r--r-- | libavcodec/wma.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 99a87f62fa..4c1bf00486 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -22,6 +22,7 @@ #include "libavutil/attributes.h" #include "avcodec.h" +#include "internal.h" #include "sinewin.h" #include "wma.h" #include "wma_common.h" @@ -183,13 +184,13 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2) else high_freq = high_freq * 0.5; } - av_dlog(s->avctx, "flags2=0x%x\n", flags2); - av_dlog(s->avctx, "version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n", + ff_dlog(s->avctx, "flags2=0x%x\n", flags2); + ff_dlog(s->avctx, "version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n", s->version, avctx->channels, avctx->sample_rate, avctx->bit_rate, avctx->block_align); - av_dlog(s->avctx, "bps=%f bps1=%f high_freq=%f bitoffset=%d\n", + ff_dlog(s->avctx, "bps=%f bps1=%f high_freq=%f bitoffset=%d\n", bps, bps1, high_freq, s->byte_offset_bits); - av_dlog(s->avctx, "use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n", + ff_dlog(s->avctx, "use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n", s->use_noise_coding, s->use_exp_vlc, s->nb_block_sizes); /* compute the scale factor band sizes for each MDCT block size */ @@ -279,14 +280,14 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2) } s->exponent_high_sizes[k] = j; #if 0 - tprintf(s->avctx, "%5d: coefs_end=%d high_band_start=%d nb_high_bands=%d: ", + ff_tlog(s->avctx, "%5d: coefs_end=%d high_band_start=%d nb_high_bands=%d: ", s->frame_len >> k, s->coefs_end[k], s->high_band_start[k], s->exponent_high_sizes[k]); for (j = 0; j < s->exponent_high_sizes[k]; j++) - tprintf(s->avctx, " %d", s->exponent_high_bands[k][j]); - tprintf(s->avctx, "\n"); + ff_tlog(s->avctx, " %d", s->exponent_high_bands[k][j]); + ff_tlog(s->avctx, "\n"); #endif /* 0 */ } } @@ -295,12 +296,12 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2) { int i, j; for (i = 0; i < s->nb_block_sizes; i++) { - tprintf(s->avctx, "%5d: n=%2d:", + ff_tlog(s->avctx, "%5d: n=%2d:", s->frame_len >> i, s->exponent_sizes[i]); for (j = 0; j < s->exponent_sizes[i]; j++) - tprintf(s->avctx, " %d", s->exponent_bands[i][j]); - tprintf(s->avctx, "\n"); + ff_tlog(s->avctx, " %d", s->exponent_bands[i][j]); + ff_tlog(s->avctx, "\n"); } } #endif /* TRACE */ |