[FFmpeg-cvslog] matroskadec: check audio sample rate
Andreas Cadhalpun
git at videolan.org
Tue Jul 28 03:21:34 CEST 2015
ffmpeg | branch: release/2.5 | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Mon Jun 15 20:59:22 2015 +0200| [a5bc5dd49ae1ed29489f9c8ba88387322c376bf1] | committer: Michael Niedermayer
matroskadec: check audio sample rate
And default to 8000 if it is invalid.
An invalid sample rate can trigger av_assert2 in av_rescale_rnd.
Reviewed-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
(cherry picked from commit 5b76c82fd7a5f4f36bb901b8c43d7f7319599599)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5bc5dd49ae1ed29489f9c8ba88387322c376bf1
---
libavformat/matroskadec.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 0654b31..120a554 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1604,6 +1604,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;
+ }
+
if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
if (!track->default_duration && track->video.frame_rate > 0)
track->default_duration = 1000000000 / track->video.frame_rate;
More information about the ffmpeg-cvslog
mailing list