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)
commit9bdb254b980fef48bead17197a2821ca06509301
treef3ae4a4d63a36bc551df04fba518fb0a57629448
parent358d1f6e01e0e9b6e3fac632a40ca9e286b6011a
parent1bd6372cd34935815c0a061adbf3bc68ca68ff73
Merge commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73' into release/2.2

* commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

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