diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:24:04 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:24:23 +0200 |
commit | 96cea6269ac378f848a054ba8cff532734653662 (patch) | |
tree | b4d431314fb22916044e73c7ce7fcedb44cd774b /libavcodec/pngenc.c | |
parent | f54e01c24e03a7dc340bd9449debfe7fb58987da (diff) | |
parent | 5735552f1f17ea01dcbc99b08f54b5bf52176a8f (diff) | |
download | ffmpeg-96cea6269ac378f848a054ba8cff532734653662.tar.gz |
Merge commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f'
* commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f':
pngenc: Drop pointless pointer cast in png_write_row()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngenc.c')
-rw-r--r-- | libavcodec/pngenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 0d2c291a8a..401b1a2611 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -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) |