Message ID | GV1SPRMB0063DC6E9F566EDFB8761E588F532@GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | 271d6709cf123b6fed53138d02ffdbab8bf50833 |
Headers | show |
Series | [FFmpeg-devel,1/4] avcodec/jpeg2000dec, j2kenc: Constify where appropriate | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
lör 2024-02-17 klockan 21:05 +0100 skrev Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/jpeg2000dec.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c > index 3d18d48e7c..1afc6b1e2d 100644 > --- a/libavcodec/jpeg2000dec.c > +++ b/libavcodec/jpeg2000dec.c > @@ -886,8 +886,8 @@ static int get_ppm(Jpeg2000DecoderContext *s, int > n) > return AVERROR(ENOMEM); > s->has_ppm = 1; > memset(&s->packed_headers_stream, 0, sizeof(s- > >packed_headers_stream)); > - bytestream_get_buffer(&s->g.buffer, s->packed_headers + s- > >packed_headers_size, > - n - 3); > + bytestream2_get_bufferu(&s->g, s->packed_headers + s- > >packed_headers_size, > + n - 3); > s->packed_headers_size += n - 3; > > return 0; > @@ -921,10 +921,8 @@ static int get_ppt(Jpeg2000DecoderContext *s, > int n) > } else > return AVERROR(ENOMEM); > memset(&tile->packed_headers_stream, 0, sizeof(tile- > >packed_headers_stream)); > - memcpy(tile->packed_headers + tile->packed_headers_size, > - s->g.buffer, n - 3); > + bytestream2_get_bufferu(&s->g, tile->packed_headers + tile- > >packed_headers_size, n - 3); > tile->packed_headers_size += n - 3; > - bytestream2_skip(&s->g, n - 3); Looks OK. bytestream2_get_bufferu() seems to do the skipping for us. /Tomas
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 3d18d48e7c..1afc6b1e2d 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -886,8 +886,8 @@ static int get_ppm(Jpeg2000DecoderContext *s, int n) return AVERROR(ENOMEM); s->has_ppm = 1; memset(&s->packed_headers_stream, 0, sizeof(s->packed_headers_stream)); - bytestream_get_buffer(&s->g.buffer, s->packed_headers + s->packed_headers_size, - n - 3); + bytestream2_get_bufferu(&s->g, s->packed_headers + s->packed_headers_size, + n - 3); s->packed_headers_size += n - 3; return 0; @@ -921,10 +921,8 @@ static int get_ppt(Jpeg2000DecoderContext *s, int n) } else return AVERROR(ENOMEM); memset(&tile->packed_headers_stream, 0, sizeof(tile->packed_headers_stream)); - memcpy(tile->packed_headers + tile->packed_headers_size, - s->g.buffer, n - 3); + bytestream2_get_bufferu(&s->g, tile->packed_headers + tile->packed_headers_size, n - 3); tile->packed_headers_size += n - 3; - bytestream2_skip(&s->g, n - 3); return 0; }
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/jpeg2000dec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)