[FFmpeg-cvslog] avformat/movenc: assert that get_cluster_duration() value is valid
Michael Niedermayer
git at videolan.org
Fri Feb 21 04:42:10 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 21 02:15:58 2014 +0100| [20fa3fb93d0f3d3eab2b1f63a03168f492fae047] | committer: Michael Niedermayer
avformat/movenc: assert that get_cluster_duration() value is valid
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20fa3fb93d0f3d3eab2b1f63a03168f492fae047
---
libavformat/movenc.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index bb4d379..af7efc9 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -614,7 +614,12 @@ static int get_cluster_duration(MOVTrack *track, int cluster_idx)
else
next_dts = track->cluster[cluster_idx + 1].dts;
- return next_dts - track->cluster[cluster_idx].dts;
+ next_dts -= track->cluster[cluster_idx].dts;
+
+ av_assert0(next_dts >= 0);
+ av_assert0(next_dts <= INT_MAX);
+
+ return next_dts;
}
static int get_samples_per_packet(MOVTrack *track)
More information about the ffmpeg-cvslog
mailing list