eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4'

Browse Source 
* commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4':
  avconv: set packet duration for CFR video streams

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-11-10 18:25:51 +01:00
parent de0e219a8a 3efd71b4d0
commit d3d4bc4784
10 changed files with 253 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

@@ -671,6 +671,11 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
else
ost->error[i] = -1;
}
if (ost->frame_rate.num) {
pkt->duration = av_rescale_q(1, av_inv_q(ost->frame_rate),
ost->st->time_base);
}
}
if (bsfc)