summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2011-07-12 15:13:29 -0700
committerAlex Converse <alex.converse@gmail.com>2011-07-13 10:39:06 -0700
commita58858d60d37c7abfcea11bb387909bf9cd4916d (patch)
treec945ca41d93cb8fcf504e78b9d79a1a7e18dbab8 /libavcodec
parent71a1d1116fd952f348d732c19ba7f4ebe041ce26 (diff)
lavf: Cleanup try_decode_frame() logic.
This fixes AAC playback in ffplay.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aacdec.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index f26a4b74a7..dac85c229d 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -568,9 +568,6 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
ac->m4ac.sample_rate = avctx->sample_rate;
if (avctx->extradata_size > 0) {
- avctx->channels = 0;
- avctx->frame_size = 0;
- avctx->sample_rate = 0;
if (decode_audio_specific_config(ac, ac->avctx, &ac->m4ac,
avctx->extradata,
avctx->extradata_size) < 0)