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>
libavcodec/pngenc.c

index 0d2c291..401b1a2 100644 (file)
@@ -215,7 +215,7 @@ static int png_write_row(PNGEncContext *s, const uint8_t *data, int size)
     int ret;
 
     s->zstream.avail_in = size;
-    s->zstream.next_in  = (uint8_t *)data;
+    s->zstream.next_in  = data;
     while (s->zstream.avail_in > 0) {
         ret = deflate(&s->zstream, Z_NO_FLUSH);
         if (ret != Z_OK)