diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-13 21:08:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-13 21:08:28 +0200 |
| commit | 98227ba5fa456b5dacd404e125420c9abf87ff95 (patch) | |
| tree | b88171365f9893647c0b7b323bf46e538757fb08 /doc/formats.texi | |
| parent | 4cc0f79a2c11f4ef53ee1b1199896832915a668e (diff) | |
| parent | a8552ee3eb335d2fd2d6c99363367a6090298f78 (diff) | |
| download | ffmpeg-98227ba5fa456b5dacd404e125420c9abf87ff95.tar.gz | |
Merge commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78'
* commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78':
ppc: dsputil: Coalesce all init files
Conflicts:
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/formats.texi')
0 files changed, 0 insertions, 0 deletions