Merge commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:24:04 +0000 (16:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:24:23 +0000 (16:24 +0200)
* commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f':
  pngenc: Drop pointless pointer cast in png_write_row()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/pngenc.c

Simple merge