[FFmpeg-cvslog] Merge commit '1d25a86902946dbc80bb3a38e61755181ca3af7b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Mar 22 16:35:13 2017 +0100| [7a11e6b2fde843eec55f37852fd221eaba6419fb] | committer: Clément Bœsch

Merge commit '1d25a86902946dbc80bb3a38e61755181ca3af7b'

* commit '1d25a86902946dbc80bb3a38e61755181ca3af7b':
  huffyuvdsp: Reenable PPC optimizations

This commit is a noop, see 6596b34954fc2c101fe620a4b4d305bf27315013

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a11e6b2fde843eec55f37852fd221eaba6419fb
---