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.
Unified · Split
| @@ -1012,7 +1012,6 @@ static int streamcopy_init(const Muxer *mux, OutputStream *ost, AVDictionary **e · 1011 unmodified lines | ||
| 1012 | 1012 | else |
| 1013 | 1013 | sar = par->sample_aspect_ratio; |
| 1014 | 1014 | ost->st->sample_aspect_ratio = par->sample_aspect_ratio = sar; |
| 1015 | − ost->st->avg_frame_rate = ist->st->avg_frame_rate; | |
| 1016 | 1015 | ost->st->r_frame_rate = ist->st->r_frame_rate; |
| 1017 | 1016 | break; |
| 1018 | 1017 | } |
| @@ -1 +1 @@ | ||
| 1 | −b28d4ca13029fdc80a114b56467be9d7 | |
| 1 | +69ffc45e19ab070bc3e964d7b718fe53 | |