mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
ac26d7ea9d
* commit 'a736ae1e96b8718af0962106aa40df5f4b246b55': doc: Document mpegts muxrate Conflicts: doc/muxers.texi See: 5b76c3a1204944a74f4c1fb4ce1ebe58940e7f78 Merged-by: Michael Niedermayer <michaelni@gmx.at>