[FFmpeg-cvslog] Merge commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  1 16:24:04 2014 +0200| [96cea6269ac378f848a054ba8cff532734653662] | committer: Michael Niedermayer

Merge commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f'

* commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f':
  pngenc: Drop pointless pointer cast in png_write_row()

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

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