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/cook.c | |
| 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/cook.c')
| -rw-r--r-- | libavcodec/cook.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 19c48ed633..cca97e3046 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -420,11 +420,9 @@ static void categorize(COOKContext *q, COOKSubpacket *p, const int *quant_index_ bits_left = p->bits_per_subpacket - get_bits_count(&q->gb); - if (bits_left > q->samples_per_channel) { + if (bits_left > q->samples_per_channel) bits_left = q->samples_per_channel + ((bits_left - q->samples_per_channel) * 5) / 8; - //av_log(q->avctx, AV_LOG_ERROR, "bits_left = %d\n",bits_left); - } bias = -32; @@ -936,10 +934,7 @@ static int decode_subpacket(COOKContext *q, COOKSubpacket *p, { int sub_packet_size = p->size; int res; - /* packet dump */ - // for (i = 0; i < sub_packet_size ; i++) - // av_log(q->avctx, AV_LOG_ERROR, "%02x", inbuffer[i]); - // av_log(q->avctx, AV_LOG_ERROR, "\n"); + memset(q->decode_buffer_1, 0, sizeof(q->decode_buffer_1)); decode_bytes_and_gain(q, p, inbuffer, &p->gains1); |