[SCM] libav/experimental: Fix assertion fail on audio files with invalid sample rates, fixes issue 2475.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:21:27 UTC 2013
The following commit has been merged in the experimental branch:
commit 6cbce6365067e1bdd5127d9001809726ea538e09
Author: Daniel Kang <daniel.d.kang at gmail.com>
Date: Thu Jan 6 03:30:19 2011 +0000
Fix assertion fail on audio files with invalid sample rates,
fixes issue 2475.
Patch by Daniel Kang, daniel.d.kang at gmail
Originally committed as revision 26240 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/utils.c b/libavformat/utils.c
index fb93e3b..32067e9 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -812,7 +812,7 @@ static void compute_frame_duration(int *pnum, int *pden, AVStream *st,
break;
case AVMEDIA_TYPE_AUDIO:
frame_size = get_audio_frame_size(st->codec, pkt->size);
- if (frame_size < 0)
+ if (frame_size <= 0 || st->codec->sample_rate <= 0)
break;
*pnum = frame_size;
*pden = st->codec->sample_rate;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list