On 16.06.2015 02:16, Michael Niedermayer wrote:
> On Mon, Jun 15, 2015 at 09:17:36PM +0200, Andreas Cadhalpun wrote:
>> And default to 8000 if it is invalid.
>>
>> An invalid sample rate can trigger av_assert2 in av_rescale_rnd.
>>
>> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
>> ---
>> libavformat/matroskadec.c | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>>
>> diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
>> index 3512f0f..81dd53f 100644
>> --- a/libavformat/matroskadec.c
>> +++ b/libavformat/matroskadec.c
>> @@ -1680,6 +1680,14 @@ static int matroska_parse_tracks(AVFormatContext *s)
>> if (!track->codec_id)
>> continue;
>>
>> + if (track->audio.samplerate < 0 || track->audio.samplerate >
>> INT_MAX ||
>> + isnan(track->audio.samplerate)) {
>> + av_log(matroska->ctx, AV_LOG_WARNING,
>> + "Invalid sample rate %f, defaulting to 8000 instead.\n",
>> + track->audio.samplerate);
>> + track->audio.samplerate = 8000;
>> + }
>> +
>
> LGTM, alternatively the sample rate could be set to 0
I'd think using the MATROSKA_ID_AUDIOSAMPLINGFREQ default of 8000 is better,
but if there are good reasons to use 0 instead, that can be changed.
I pushed my patch with 8000 for now.
Best regards,
Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
