| Message ID | 20190912092342.16465-1-lance.lmwang@gmail.com |
|---|---|
| State | Accepted |
| Commit | 9d442102b9093405f4e2525a9f97e51fe5303a80 |
| Headers | show |
Am Do., 12. Sept. 2019 um 11:24 Uhr schrieb <lance.lmwang@gmail.com>: > > From: Limin Wang <lance.lmwang@gmail.com> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > libavcodec/lcldec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c > index 046cdc4f8e..1154221f8f 100644 > --- a/libavcodec/lcldec.c > +++ b/libavcodec/lcldec.c > @@ -136,7 +136,7 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, i > av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); > return AVERROR_UNKNOWN; > } > - c->zstream.next_in = (uint8_t *)src; > + c->zstream.next_in = src; I prefer this patchset, others may disagree. Thank you, Carl Eugen
On Thu, Sep 12, 2019 at 12:55:09PM +0200, Carl Eugen Hoyos wrote: > Am Do., 12. Sept. 2019 um 11:24 Uhr schrieb <lance.lmwang@gmail.com>: > > > > From: Limin Wang <lance.lmwang@gmail.com> > > > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > > --- > > libavcodec/lcldec.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c > > index 046cdc4f8e..1154221f8f 100644 > > --- a/libavcodec/lcldec.c > > +++ b/libavcodec/lcldec.c > > @@ -136,7 +136,7 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, i > > av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); > > return AVERROR_UNKNOWN; > > } > > - c->zstream.next_in = (uint8_t *)src; > > + c->zstream.next_in = src; > > I prefer this patchset, others may disagree. OK, no problem, thanks for your review. > > Thank you, Carl Eugen > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Thu, Sep 12, 2019 at 12:55:09PM +0200, Carl Eugen Hoyos wrote: > Am Do., 12. Sept. 2019 um 11:24 Uhr schrieb <lance.lmwang@gmail.com>: > > > > From: Limin Wang <lance.lmwang@gmail.com> > > > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > > --- > > libavcodec/lcldec.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c > > index 046cdc4f8e..1154221f8f 100644 > > --- a/libavcodec/lcldec.c > > +++ b/libavcodec/lcldec.c > > @@ -136,7 +136,7 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, i > > av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); > > return AVERROR_UNKNOWN; > > } > > - c->zstream.next_in = (uint8_t *)src; > > + c->zstream.next_in = src; > > I prefer this patchset, others may disagree. ping for the patchset, thank you. > > Thank you, Carl Eugen > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Thu, Sep 12, 2019 at 12:55:09PM +0200, Carl Eugen Hoyos wrote: > Am Do., 12. Sept. 2019 um 11:24 Uhr schrieb <lance.lmwang@gmail.com>: > > > > From: Limin Wang <lance.lmwang@gmail.com> > > > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > > --- > > libavcodec/lcldec.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c > > index 046cdc4f8e..1154221f8f 100644 > > --- a/libavcodec/lcldec.c > > +++ b/libavcodec/lcldec.c > > @@ -136,7 +136,7 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, i > > av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); > > return AVERROR_UNKNOWN; > > } > > - c->zstream.next_in = (uint8_t *)src; > > + c->zstream.next_in = src; > > I prefer this patchset, others may disagree. will apply the patchset. > > Thank you, Carl Eugen > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 046cdc4f8e..1154221f8f 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -136,7 +136,7 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, i av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); return AVERROR_UNKNOWN; } - c->zstream.next_in = (uint8_t *)src; + c->zstream.next_in = src; c->zstream.avail_in = src_len; c->zstream.next_out = c->decomp_buf + offset; c->zstream.avail_out = c->decomp_size - offset;