From 896e59758a11ff645879098b5ebca2e753731b4e Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Mon, 11 Jul 2011 20:35:02 +0200 Subject: Move resetting of channels, sample_rate back to av_find_stream_info. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resetting it on codec init would incorrectly clear the values if av_find_stream_info was already run before, in particular breaking ffplay. This fixes trac tickets #213 and #262. Signed-off-by: Reimar Döffinger --- libavcodec/aacdec.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 8a936da59e..d9f60d6d23 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -570,9 +570,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) -- cgit v1.2.3