Merge commit '4506a854a4d846692ba71daeeff661dc214c8fa2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 12:02:27 +0000 (13:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 12:06:31 +0000 (13:06 +0100)
* commit '4506a854a4d846692ba71daeeff661dc214c8fa2':
  arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/vp3dsp_init_arm.c

Simple merge