generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aac: reconfigure output on pop

Browse Source 
Fixes Ticket1918

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6f77122bf5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-22 17:33:22 +01:00
parent f64e4a8c9a
commit 6e8ed38fab
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/aacdec.c
View File

@@ -113,6 +113,10 @@
static VLC vlc_scalefactors; static VLC vlc_scalefactors;
static VLC vlc_spectral[11]; static VLC vlc_spectral[11];
static int output_configure(AACContext *ac,
uint8_t layout_map[MAX_ELEM_ID*4][3], int tags,
enum OCStatus oc_type, int get_new_frame);
#define overread_err "Input buffer exhausted before END element found\n" #define overread_err "Input buffer exhausted before END element found\n"
static int count_channels(uint8_t (*layout)[3], int tags) static int count_channels(uint8_t (*layout)[3], int tags)
@@ -406,6 +410,8 @@ static void pop_output_configuration(AACContext *ac) {
ac->oc[1] = ac->oc[0]; ac->oc[1] = ac->oc[0];
ac->avctx->channels = ac->oc[1].channels; ac->avctx->channels = ac->oc[1].channels;
ac->avctx->channel_layout = ac->oc[1].channel_layout; ac->avctx->channel_layout = ac->oc[1].channel_layout;
output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags,
ac->oc[1].status, 0);
} }
} }