mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-01-21 21:41:13 +01:00
* commit '9257692ac15eff7b07540c1f61cebde0d8823fbd': lavf: Only initialize s->offset once when using avoid_negative_ts make_zero Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>