diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-07-11 20:35:02 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-07-12 19:44:59 +0200 |
| commit | 896e59758a11ff645879098b5ebca2e753731b4e (patch) | |
| tree | 88d2053e5dba0296cbc216e9e829252e3878dfd7 /libavcodec | |
| parent | 45ecc7a294d56e41dab621512f6f70fc2578340e (diff) | |
| download | ffmpeg-896e59758a11ff645879098b5ebca2e753731b4e.tar.gz | |
Move resetting of channels, sample_rate back to av_find_stream_info.
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 <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacdec.c | 3 |
1 files changed, 0 insertions, 3 deletions
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) |