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)
commit96cea6269ac378f848a054ba8cff532734653662
treeb4d431314fb22916044e73c7ce7fcedb44cd774b
parentf54e01c24e03a7dc340bd9449debfe7fb58987da
parent5735552f1f17ea01dcbc99b08f54b5bf52176a8f
Merge commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f'

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

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