mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-07 11:13:41 +02: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> |
||
---|---|---|
.. | ||
api | ||
checkasm | ||
fate | ||
filtergraphs | ||
maps | ||
ref | ||
streamgroups | ||
.gitignore | ||
audiogen.c | ||
audiomatch.c | ||
base64.c | ||
copycooker.sh | ||
extended.ffconcat | ||
fate-run.sh | ||
fate-valgrind.supp | ||
fate.sh | ||
Makefile | ||
md5.sh | ||
refcmp-metadata.awk | ||
reference.pnm | ||
rotozoom.c | ||
simple1.ffconcat | ||
simple2.ffconcat | ||
test.ffmeta | ||
tiny_psnr.c | ||
tiny_ssim.c | ||
utils.c | ||
videogen.c |