-
Michael Niedermayer authored
* commit 'a17ab0e4': doc: add decoders.texi Conflicts: doc/decoders.texi doc/ffmpeg.texi doc/ffplay.texi See: 5e45f034Merged-by: Michael Niedermayer <michaelni@gmx.at>
d85284d4
* commit 'a17ab0e4': doc: add decoders.texi Conflicts: doc/decoders.texi doc/ffmpeg.texi doc/ffplay.texi See: 5e45f034Merged-by: Michael Niedermayer <michaelni@gmx.at>