Commit 7b76c224 authored by Benjamin Larsson's avatar Benjamin Larsson

Correctly handle FLV_CODECID_NELLYMOSER_8HZ_MONO files

Originally committed as revision 11284 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5efaf000
...@@ -179,6 +179,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst ...@@ -179,6 +179,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
} }
else if(!strcmp(key, "audiosamplerate") && acodec && num_val >= 0) { else if(!strcmp(key, "audiosamplerate") && acodec && num_val >= 0) {
//some tools, like FLVTool2, write consistently approximate metadata sample rates //some tools, like FLVTool2, write consistently approximate metadata sample rates
if (!acodec->sample_rate) {
switch((int)num_val) { switch((int)num_val) {
case 44000: acodec->sample_rate = 44100 ; break; case 44000: acodec->sample_rate = 44100 ; break;
case 22000: acodec->sample_rate = 22050 ; break; case 22000: acodec->sample_rate = 22050 ; break;
...@@ -186,6 +187,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst ...@@ -186,6 +187,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
case 5000 : acodec->sample_rate = 5512 ; break; case 5000 : acodec->sample_rate = 5512 ; break;
default : acodec->sample_rate = num_val; default : acodec->sample_rate = num_val;
} }
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment