diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-01 15:51:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-01 16:12:38 +0200 |
| commit | 31ab1575e59e33957864d1bdf13253f8d366ccba (patch) | |
| tree | 074dd6605a3d7e0a42b6cd12d2f071fe25d3d25a /libavcodec/put_bits.h | |
| parent | adc5539e7b94a94114d591d83e7ae63f52b5916f (diff) | |
| parent | 1218777ffd152287244349d4ff9e1cbc84fa2c54 (diff) | |
| download | ffmpeg-31ab1575e59e33957864d1bdf13253f8d366ccba.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: Convert some commented-out printf/av_log instances to av_dlog
avcodec: Drop silly and/or broken printf debug output
avcodec: Drop some silly commented-out av_log() invocations
avformat: Convert some commented-out printf/av_log instances to av_dlog
avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
Remove some silly disabled code.
ac3dec: ensure get_buffer() gets a buffer for the correct number of channels
Conflicts:
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/mjpegdec.c
libavcodec/motion_est_template.c
libavcodec/mpegaudiodec.c
libavcodec/mpegvideo_enc.c
libavcodec/put_bits.h
libavcodec/ratecontrol.c
libavcodec/wmaenc.c
libavdevice/timefilter.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/avienc.c
libavformat/flvenc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/put_bits.h')
| -rw-r--r-- | libavcodec/put_bits.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index e83f72194e..f02965e300 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -131,13 +131,11 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) unsigned int bit_buf; int bit_left; - // printf("put_bits=%d %x\n", n, value); av_assert2(n <= 31 && value < (1U << n)); bit_buf = s->bit_buf; bit_left = s->bit_left; - // printf("n=%d value=%x cnt=%d buf=%x\n", n, value, bit_cnt, bit_buf); /* XXX: optimize */ #ifdef BITSTREAM_WRITER_LE bit_buf |= value << (32 - bit_left); @@ -158,7 +156,6 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) bit_buf |= value >> (n - bit_left); av_assert2(s->buf_ptr+3<s->buf_end); AV_WB32(s->buf_ptr, bit_buf); - //printf("bitbuf = %08x\n", bit_buf); s->buf_ptr+=4; bit_left+=32 - n; bit_buf = value; |