virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

ffmpeg: fix pts handling in the non monotone dts workaround

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-03 15:00:21 +02:00
parent 007ee09d7c
commit 30c05f6b02
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@@ -626,9 +626,9 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
av_log(NULL, AV_LOG_WARNING, "changing to %"PRId64". This may result "
"in incorrect timestamps in the output file.\n",
max);
pkt->dts = max;
if (pkt->pts != AV_NOPTS_VALUE)
if(pkt->pts >= pkt->dts)
pkt->pts = FFMAX(pkt->pts, max);
pkt->dts = max;
}
}
ost->last_mux_dts = pkt->dts;