]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Correctly handle FLV_CODECID_NELLYMOSER_8HZ_MONO files
authorbanan <banan@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Thu, 20 Dec 2007 11:21:10 +0000 (11:21 +0000)
committerbanan <banan@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Thu, 20 Dec 2007 11:21:10 +0000 (11:21 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11284 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/flvdec.c

index 885c4a6fe54fa1c5e5eb7f1693ce2faeeaef0087..b253b954b277ec7965a57680d996693f4d5bf7cf 100644 (file)
@@ -179,6 +179,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
             }
             else if(!strcmp(key, "audiosamplerate") && acodec && num_val >= 0) {
                 //some tools, like FLVTool2, write consistently approximate metadata sample rates
+                if (!acodec->sample_rate) {
                 switch((int)num_val) {
                     case 44000: acodec->sample_rate = 44100  ; break;
                     case 22000: acodec->sample_rate = 22050  ; break;
@@ -186,6 +187,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
                     case 5000 : acodec->sample_rate = 5512   ; break;
                     default   : acodec->sample_rate = num_val;
                 }
+                }
             }
         }
     }