diff options
| author | Alex Converse <alex.converse@gmail.com> | 2010-05-11 18:53:49 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2010-05-11 18:53:49 +0000 |
| commit | 495af353dbb0f0f4792baecc63a45ef563f80e44 (patch) | |
| tree | 090766597b3c7a14fbd8c5208ee001133fd5c8e7 | |
| parent | 2c2b2c0ac2683319eef062afb942bffd8d1760dd (diff) | |
| download | ffmpeg-495af353dbb0f0f4792baecc63a45ef563f80e44.tar.gz | |
Set cur_channel in the AAC encoder context where needed.
Most coder functions read it. Carting this around in the context may be
suboptimal; a refactor should be considered.
Originally committed as revision 23094 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/aacenc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 72e93a40c8..938df344bb 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -561,6 +561,7 @@ static int aac_encode_frame(AVCodecContext *avctx, chans = tag == TYPE_CPE ? 2 : 1; cpe = &s->cpe[i]; for (j = 0; j < chans; j++) { + s->cur_channel = start_ch + j; s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda); } cpe->common_window = 0; @@ -576,6 +577,7 @@ static int aac_encode_frame(AVCodecContext *avctx, } } } + s->cur_channel = start_ch; if (cpe->common_window && s->coder->search_for_ms) s->coder->search_for_ms(s, cpe, s->lambda); adjust_frame_information(s, cpe, chans); |