aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2010-08-30 23:52:03 +0000
committerAlex Converse <alex.converse@gmail.com>2010-08-30 23:52:03 +0000
commit8e4c11e90a58427257dc859c11210ad6588288da (patch)
tree207677346f73ee4f97386e1d6256a8eaf4c26b29 /libavcodec
parent0e107f7890338aad1190f23997562a6de3ca29e9 (diff)
downloadffmpeg-8e4c11e90a58427257dc859c11210ad6588288da.tar.gz
aacenc: Write tag.elem_id early.
Originally committed as revision 25000 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aacenc.c4
1 files 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) {