From 2f3d7ea974749afb65f04b2847d94dd50198359f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 21 Dec 2008 20:56:30 +0000 Subject: [PATCH] Fix detection of audio codec in K70707-ARIA229.flv. Fixes issue760. Originally committed as revision 16254 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/flvdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 29925c342c..01da9e89e0 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -391,10 +391,12 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) } if(is_audio){ - if(!st->codec->channels || !st->codec->sample_rate || !st->codec->bits_per_coded_sample || (!st->codec->codec_id && !st->codec->codec_tag)) { + if(!st->codec->channels || !st->codec->sample_rate || !st->codec->bits_per_coded_sample) { st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1; st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3); st->codec->bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8; + } + if(!st->codec->codec_id){ flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK); } }else{