ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

nutenc/write_index: warn if 2 consecutive keyframes have the same PTS and discard the 2nd

Browse Source 
This fixes an assertion failure and regression and restores previous behaviour
Fixes Ticket3197

An alternative would be to fail hard in this case and refuse to mux such data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit de2a2caf4d)
This commit is contained in:
Michael Niedermayer 2013-12-22 18:47:28 +01:00 committed by Carl Eugen Hoyos
parent 94c3f8165c
commit b432043d55
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/nutenc.c
View File

@ -584,8 +584,15 @@ static int write_index(NUTContext *nut, AVIOContext *bc) {
int64_t last_pts= -1;
int j, k;
for (j=0; j<nut->sp_count; j++) {
int flag = (nus->keyframe_pts[j] != AV_NOPTS_VALUE) ^ (j+1 == nut->sp_count);
int flag;
int n = 0;
if (j && nus->keyframe_pts[j] == nus->keyframe_pts[j-1]) {
av_log(nut->avf, AV_LOG_WARNING, "Multiple keyframes with same PTS\n");
nus->keyframe_pts[j] = AV_NOPTS_VALUE;
}
flag = (nus->keyframe_pts[j] != AV_NOPTS_VALUE) ^ (j+1 == nut->sp_count);
for (; j<nut->sp_count && (nus->keyframe_pts[j] != AV_NOPTS_VALUE) == flag; j++)
n++;