From 8e4c11e90a58427257dc859c11210ad6588288da Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Mon, 30 Aug 2010 23:52:03 +0000 Subject: [PATCH] aacenc: Write tag.elem_id early. Originally committed as revision 25000 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aacenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 3985204b96..0c911b8f63 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -561,6 +561,8 @@ static int aac_encode_frame(AVCodecContext *avctx, tag = chan_map[i+1]; chans = tag == TYPE_CPE ? 2 : 1; cpe = &s->cpe[i]; + put_bits(&s->pb, 3, tag); + put_bits(&s->pb, 4, chan_el_counter[tag]++); for (j = 0; j < chans; j++) { s->cur_channel = start_ch + j; ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]); @@ -583,8 +585,6 @@ static int aac_encode_frame(AVCodecContext *avctx, if (cpe->common_window && s->coder->search_for_ms) s->coder->search_for_ms(s, cpe, s->lambda); adjust_frame_information(s, cpe, chans); - put_bits(&s->pb, 3, tag); - put_bits(&s->pb, 4, chan_el_counter[tag]++); if (chans == 2) { put_bits(&s->pb, 1, cpe->common_window); if (cpe->common_window) {