apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-29 11:42:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

avformat/utils: use av_reduce() to simplify code and avoid overflow in ff_compute_frame_duration()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-15 18:23:21 +02:00
parent 2b37864e7f
commit a92192d2e4
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/utils.c
View File

@@ -726,17 +726,18 @@ void ff_compute_frame_duration(AVFormatContext *s, int *pnum, int *pden, AVStrea
*pnum = st->time_base.num; *pnum = st->time_base.num;
*pden = st->time_base.den; *pden = st->time_base.den;
} else if (codec_framerate.den * 1000LL > codec_framerate.num) { } else if (codec_framerate.den * 1000LL > codec_framerate.num) {
*pnum = codec_framerate.den;
*pden = codec_framerate.num;
*pden *= st->codec->ticks_per_frame;
av_assert0(st->codec->ticks_per_frame); av_assert0(st->codec->ticks_per_frame);
av_reduce(pnum, pden,
codec_framerate.den,
codec_framerate.num * (int64_t)st->codec->ticks_per_frame,
INT_MAX);
if (pc && pc->repeat_pict) { if (pc && pc->repeat_pict) {
av_assert0(s->iformat); // this may be wrong for interlaced encoding but its not used for that case av_assert0(s->iformat); // this may be wrong for interlaced encoding but its not used for that case
if (*pnum > INT_MAX / (1 + pc->repeat_pict)) av_reduce(pnum, pden,
*pden /= 1 + pc->repeat_pict; (*pnum) * (1LL + pc->repeat_pict),
else (*pden),
*pnum *= 1 + pc->repeat_pict; INT_MAX);
} }
/* If this codec can be interlaced or progressive then we need /* If this codec can be interlaced or progressive then we need
* a parser to compute duration of a packet. Thus if we have * a parser to compute duration of a packet. Thus if we have