Merge commit '23af29e8825ac112877b9ac0572ef11e5f0539f2' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 10:02:36 +0000 (11:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 10:02:36 +0000 (11:02 +0100)
commit27e6b4a3ffecf01a199366ea456ce62dc7f44da2
tree967befed100749ba32e83afede9ea9cb3e138303
parentb82860caa7d8cfa2a1ca663422b3c966185d6c1d
parent23af29e8825ac112877b9ac0572ef11e5f0539f2
Merge commit '23af29e8825ac112877b9ac0572ef11e5f0539f2' into release/2.2

* commit '23af29e8825ac112877b9ac0572ef11e5f0539f2':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

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