[FFmpeg-cvslog] r11284 - trunk/libavformat/flvdec.c

[banan]

Author: banan
Date: Thu Dec 20 12:21:10 2007
New Revision: 11284

Log:
Correctly handle FLV_CODECID_NELLYMOSER_8HZ_MONO files

Modified:
   trunk/libavformat/flvdec.c

Modified: trunk/libavformat/flvdec.c
==============================================================================
--- trunk/libavformat/flvdec.c	(original)
+++ trunk/libavformat/flvdec.c	Thu Dec 20 12:21:10 2007
@@ -179,6 +179,7 @@ static int amf_parse_object(AVFormatCont
             }
             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(AVFormatCont
                     case 5000 : acodec->sample_rate = 5512   ; break;
                     default   : acodec->sample_rate = num_val;
                 }
+                }
             }
         }
     }