mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 16:52:31 +00:00
ee9ae4e8ba
Fix "ost->st->avg_frame_rate = ost->frame_rate" in streamcopy_init() being reset to input's frame rate a few lines below. Note that in current code, there are some discrepancies amongst the muxers. For example, avienc relies on time_base, so it is not affected by this patch, whereas mxfenc and matroskaenc do use avg_frame_rate, so this patch fixes -r being honored. In the updated fate test, the input is (wrongly) probed as 50fps. With this patch, the correct value (25fps) is successfully forced with -r. Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> Signed-off-by: Anton Khirnov <anton@khirnov.net> |
||
---|---|---|
.. | ||
cmdutils.c | ||
cmdutils.h | ||
ffmpeg_dec.c | ||
ffmpeg_demux.c | ||
ffmpeg_enc.c | ||
ffmpeg_filter.c | ||
ffmpeg_hw.c | ||
ffmpeg_mux_init.c | ||
ffmpeg_mux.c | ||
ffmpeg_mux.h | ||
ffmpeg_opt.c | ||
ffmpeg_sched.c | ||
ffmpeg_sched.h | ||
ffmpeg_utils.h | ||
ffmpeg.c | ||
ffmpeg.h | ||
ffplay_renderer.c | ||
ffplay_renderer.h | ||
ffplay.c | ||
ffprobe.c | ||
fftools.manifest | ||
fftoolsres.rc | ||
fopen_utf8.h | ||
Makefile | ||
objpool.c | ||
objpool.h | ||
opt_common.c | ||
opt_common.h | ||
sync_queue.c | ||
sync_queue.h | ||
thread_queue.c | ||
thread_queue.h |