Merge commit '5a7f382a5d33d9a26890affe6c8c5070a48dfc22'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 20:52:36 +0000 (21:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 21:03:00 +0000 (22:03 +0100)
* commit '5a7f382a5d33d9a26890affe6c8c5070a48dfc22':
  armv6: vp8: use explicit labels in motion compensation asm

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

Simple merge