Merge commit 'de81b6ae4f38273ff27020f494cc46539110d34b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:59:58 +0000 (14:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 13:00:02 +0000 (15:00 +0200)
commit3e75f986675fe522dfe4e35c6bf761e9cb668597
tree919cf72e5033ac7c2b7d21dd4c15a891e284f4a9
parent8251529ff37e0fdfb4ee6ba74f14ebc200e0ae2f
parentde81b6ae4f38273ff27020f494cc46539110d34b
Merge commit 'de81b6ae4f38273ff27020f494cc46539110d34b'

* commit 'de81b6ae4f38273ff27020f494cc46539110d34b':
  ppc: fdct: Remove vim editor settings comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ppc/fdct_altivec.c