diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 18:47:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 19:00:28 +0100 |
| commit | de2a2caf4dedb28a959d0ff6f02751bb6c3ff033 (patch) | |
| tree | db96823c1ced71def321e70db8b289c8c758d763 | |
| parent | 64b98df38910bfb921988a0be89da3038274232e (diff) | |
| download | ffmpeg-de2a2caf4dedb28a959d0ff6f02751bb6c3ff033.tar.gz | |
nutenc/write_index: warn if 2 consecutive keyframes have the same PTS and discard the 2nd
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>
| -rw-r--r-- | libavformat/nutenc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 10b8fc88eb..f2172fbf8b 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -586,8 +586,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++; |