mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
d85284d4aa
* commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7': doc: add decoders.texi Conflicts: doc/decoders.texi doc/ffmpeg.texi doc/ffplay.texi See: 5e45f03420945dfeaf66729f5d022e5c15ff5723 Merged-by: Michael Niedermayer <michaelni@gmx.at>