Merge commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:31:20 +0000 (17:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:31:24 +0000 (17:31 +0200)
* commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

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

Simple merge