Merge commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jul 2014 19:08:28 +0000 (21:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jul 2014 19:08:28 +0000 (21:08 +0200)
commit98227ba5fa456b5dacd404e125420c9abf87ff95
treeb88171365f9893647c0b7b323bf46e538757fb08
parent4cc0f79a2c11f4ef53ee1b1199896832915a668e
parenta8552ee3eb335d2fd2d6c99363367a6090298f78
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>
libavcodec/ppc/Makefile
libavcodec/ppc/dsputil_altivec.c