Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Jan 2014 14:19:51 +0000 (15:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Jan 2014 14:19:51 +0000 (15:19 +0100)
commitd85284d4aa7d388f33bd8a418df3a3cbe349cd39
tree217b82cad9335d6a1a18b50476f892e2c3133a6a
parent3c7195a96933e27c395a617a178f43ef4bc65a92
parenta17ab0e46a9fec7c31cc1be363828184c6ecebf7
Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'

* 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>
doc/decoders.texi