You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
Merge commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba'
* commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba': doc: Sort the muxer documentation Conflicts: doc/muxers.texi No change as ours was already sorted Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: