[FFmpeg-cvslog] Merge commit '2257165bff243534982f4ddabae4e65e2a35f2ab'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 22:33:54 2014 +0200| [e1795bc380896701dfbbf904a8089154aff04746] | committer: Michael Niedermayer

Merge commit '2257165bff243534982f4ddabae4e65e2a35f2ab'

* commit '2257165bff243534982f4ddabae4e65e2a35f2ab':
  png: disable broken MMX/SIMD code for bpp <= 2

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

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