har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

movenc-test: Fix integer overflows

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Michael Niedermayer 2015-11-23 14:25:41 +01:00 committed by Martin Storsjö
parent fdd5c48ebd
commit 5b70fb8fee
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/movenc-test.c
View File

@ -60,8 +60,8 @@ AVStream *video_st, *audio_st;
int64_t audio_dts, video_dts;
int bframes;
int duration;
int audio_duration;
int64_t duration;
int64_t audio_duration;
int frames;
int gop_size;
int64_t next_p_pts;
@ -196,9 +196,9 @@ static void init_fps(int bf, int audio_preroll, int fps)
frames = 0;
gop_size = 30;
duration = video_st->time_base.den / fps;
audio_duration = 1024 * audio_st->time_base.den / audio_st->codec->sample_rate;
audio_duration = 1024LL * audio_st->time_base.den / audio_st->codec->sample_rate;
if (audio_preroll)
audio_preroll = 2048 * audio_st->time_base.den / audio_st->codec->sample_rate;
audio_preroll = 2048LL * audio_st->time_base.den / audio_st->codec->sample_rate;
bframes = bf;
video_dts = bframes ? -duration : 0;

2
tests/ref/fate/movenc
View File

@ -1,7 +1,7 @@
4e7e78793cdda3c9ed28fbf47df39c43 2449 non-empty-moov
5b825dc829f35c9d5b76834c378276d7 2897 non-empty-moov-elst
0fd659671dec7d05cfa533a4579b1d6d 2817 non-empty-moov-no-elst
890ad73874bff5aefbd549bc75a15b8e 9139 ismv
845fdc9226a0e3f14e5f92219ce8f570 3871 ismv
aa6f42a0546a27f7047f1cff812a552f 2327 empty-moov
9a439649d13cdcddf6179234fe3d8a8e 2727 empty-moov-no-elst
2451cb44e678845ed26e014e1affe5e8 2559 empty-moov-no-elst-no-adjust