summaryrefslogtreecommitdiff
path: root/libavcodec/aacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-18 09:43:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-18 09:43:13 +0200
commit124eb7e476f7e3f66dcdc30f780a45b378751219 (patch)
treefdcf4e9712f90b7962d904b2616a61dac07097cc /libavcodec/aacdec.c
parentaa0f84df5a9386ba7c83669a7b999a2fd9ca4998 (diff)
aacdec: drop channel reseting code.
its no longer needed and causes a race with the flv demuxer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
-rw-r--r--libavcodec/aacdec.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index fd2e4a2198..ba3a8f7f9e 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -374,9 +374,6 @@ static void pop_output_configuration(AACContext *ac) {
ac->oc[1] = ac->oc[0];
ac->avctx->channels = ac->oc[1].channels;
ac->avctx->channel_layout = ac->oc[1].channel_layout;
- }else{
- ac->avctx->channels = 0;
- ac->avctx->channel_layout = 0;
}
}
}