[SCM] libav/experimental: Fix detection of audio codec in K70707-ARIA229.flv. Fixes issue760.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2f3d7ea974749afb65f04b2847d94dd50198359f
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Dec 21 20:56:30 2008 +0000

    Fix detection of audio codec in K70707-ARIA229.flv.
    Fixes issue760.
    
    Originally committed as revision 16254 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 29925c3..01da9e8 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{

-- 
Libav/FFmpeg packaging