RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmpeg: Do not clip timestamps at LONG_MAX. 

Fixes ticket #8612.
This commit is contained in:
Carl Eugen Hoyos 2020-04-13 14:01:14 +02:00
parent e7eb379d98
commit d5bf704f50
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fftools/ffmpeg.c
View File

@ -1147,7 +1147,7 @@ static void do_video_out(OutputFile *of,
av_log(NULL, AV_LOG_DEBUG, "Not duplicating %d initial frames\n", (int)lrintf(delta0)); av_log(NULL, AV_LOG_DEBUG, "Not duplicating %d initial frames\n", (int)lrintf(delta0));
delta = duration; delta = duration;
delta0 = 0; delta0 = 0;
ost->sync_opts = lrint(sync_ipts); ost->sync_opts = llrint(sync_ipts);
} }
case VSYNC_CFR: case VSYNC_CFR:
// FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c // FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
@ -1158,18 +1158,18 @@ static void do_video_out(OutputFile *of,
else if (delta > 1.1) { else if (delta > 1.1) {
nb_frames = lrintf(delta); nb_frames = lrintf(delta);
if (delta0 > 1.1) if (delta0 > 1.1)
nb0_frames = lrintf(delta0 - 0.6); nb0_frames = llrintf(delta0 - 0.6);
} }
break; break;
case VSYNC_VFR: case VSYNC_VFR:
if (delta <= -0.6) if (delta <= -0.6)
nb_frames = 0; nb_frames = 0;
else if (delta > 0.6) else if (delta > 0.6)
ost->sync_opts = lrint(sync_ipts); ost->sync_opts = llrint(sync_ipts);
break; break;
case VSYNC_DROP: case VSYNC_DROP:
case VSYNC_PASSTHROUGH: case VSYNC_PASSTHROUGH:
ost->sync_opts = lrint(sync_ipts); ost->sync_opts = llrint(sync_ipts);
break; break;
default: default:
av_assert0(0); av_assert0(0);