diff options
author | Anton Khirnov <anton@khirnov.net> | 2016-07-15 06:50:47 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2016-07-22 19:08:12 +0200 |
commit | b0f36a0043d76436cc7ab8ff92ab99c94595d3c0 (patch) | |
tree | 3ec757cccb2461896db85bb27cee91e5a0a1e727 /avconv.h | |
parent | 9064777dbb335ab4809ae09e3fdcc0245f925cdc (diff) | |
download | ffmpeg-b0f36a0043d76436cc7ab8ff92ab99c94595d3c0.tar.gz |
avconv: stop using setpts for input framerate forced with -r
The setpts filter does not signal to the rest of the filtergraph that
the stream is CFR. Just generate the timestamps manually instead.
Diffstat (limited to 'avconv.h')
-rw-r--r-- | avconv.h | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -269,6 +269,11 @@ typedef struct InputStream { int64_t last_dts; int64_t min_pts; /* pts with the smallest value in a current stream */ int64_t max_pts; /* pts with the higher value in a current stream */ + + // when forcing constant input framerate through -r, + // this contains the pts that will be given to the next decoded frame + int64_t cfr_next_pts; + int64_t nb_samples; /* number of samples in the last decoded audio frame before looping */ PtsCorrectionContext pts_ctx; double ts_scale; |