diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-30 15:19:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-30 15:19:51 +0100 |
| commit | d85284d4aa7d388f33bd8a418df3a3cbe349cd39 (patch) | |
| tree | 217b82cad9335d6a1a18b50476f892e2c3133a6a /arch.mak | |
| parent | 3c7195a96933e27c395a617a178f43ef4bc65a92 (diff) | |
| parent | a17ab0e46a9fec7c31cc1be363828184c6ecebf7 (diff) | |
| download | ffmpeg-d85284d4aa7d388f33bd8a418df3a3cbe349cd39.tar.gz | |
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>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions