mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-07-09 08:08:08 +00:00
Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
25 KiB
25 KiB