diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-02 05:12:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-02 05:12:10 +0200 |
| commit | cd8cb54990be4fbd23e28f9d7c2c6170d3667692 (patch) | |
| tree | 28965f743e1e731b5a7616cbd7b0551c416da327 /libavcodec/mpegaudioenc.c | |
| parent | 06a9da736554197601e4062298fcf45a5e8d49ff (diff) | |
| parent | 8e112df409061034202b98fcc6ce2c1c670c0dda (diff) | |
| download | ffmpeg-cd8cb54990be4fbd23e28f9d7c2c6170d3667692.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: ac3dsp: optimised update_bap_counts()
mpegaudiodec: Fix av_dlog() invocation.
h264/10bit: add HAVE_ALIGNED_STACK checks.
Update 8-bit H.264 IDCT function names to reflect bit-depth.
Add IDCT functions for 10-bit H.264.
mpegaudioenc: Fix broken av_dlog statement.
Employ correct printf format specifiers, mostly in debug output.
ARM: fix MUL64 inline asm for pre-armv6
Conflicts:
libavcodec/mpegaudioenc.c
libavformat/ape.c
libavformat/mxfdec.c
libavformat/r3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudioenc.c')
| -rw-r--r-- | libavcodec/mpegaudioenc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index c3d86137fa..a5859837ef 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -548,13 +548,11 @@ static void compute_bit_allocation(MpegAudioContext *s, } } } -#if 0 - printf("current=%d max=%d max_sb=%d alloc=%d\n", - current_frame_size, max_frame_size, max_sb, - bit_alloc[max_sb]); -#endif if (max_sb < 0) break; + av_dlog(NULL, "current=%d max=%d max_sb=%d max_ch=%d alloc=%d\n", + current_frame_size, max_frame_size, max_sb, max_ch, + bit_alloc[max_ch][max_sb]); /* find alloc table entry (XXX: not optimal, should use pointer table) */ |