Merge commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 10:32:07 +0000 (11:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 11:03:55 +0000 (12:03 +0100)
commitf88f7b86a962b2c700bf37d82d81a73ea2a5aad1
tree6f441d4c7afbdb359c98dac5d5420ab5f9be4764
parent96008082dbd3a2475ad429b02bf73ba20b4ea9bf
parent0b70fb1d518cbd796545fd6eef02772cd0d892c7
Merge commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7'

* commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7':
  dsputil: convert remaining op_pixels_func

No changes to the code as all these fixes already existed in FFmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>