History

avcodec/jpeg2000dec: Avoid using GetByteContext.buffer directly

Andreas Rheinhardt committed 2 years ago

Commit 271d6701 parent b48b3251 file · +3 −5Browse files

Unified · Split

libavcodec/jpeg2000dec.c+3−5
@@ -886,8 +886,8 @@ static int get_ppm(Jpeg2000DecoderContext *s, int n) · 885 unmodified lines
886 return AVERROR(ENOMEM);886 return AVERROR(ENOMEM);
887 s->has_ppm = 1;887 s->has_ppm = 1;
888 memset(&s->packed_headers_stream, 0, sizeof(s->packed_headers_stream));888 memset(&s->packed_headers_stream, 0, sizeof(s->packed_headers_stream));
889 bytestream_get_buffer(&s->g.buffer, s->packed_headers + s->packed_headers_size,889 bytestream2_get_bufferu(&s->g, s->packed_headers + s->packed_headers_size,
890 n - 3);890 n - 3);
891 s->packed_headers_size += n - 3;891 s->packed_headers_size += n - 3;
892 892
893 return 0;893 return 0;
@@ -921,10 +921,8 @@ static int get_ppt(Jpeg2000DecoderContext *s, int n) · 27 unmodified lines
921 } else921 } else
922 return AVERROR(ENOMEM);922 return AVERROR(ENOMEM);
923 memset(&tile->packed_headers_stream, 0, sizeof(tile->packed_headers_stream));923 memset(&tile->packed_headers_stream, 0, sizeof(tile->packed_headers_stream));
924 memcpy(tile->packed_headers + tile->packed_headers_size,924 bytestream2_get_bufferu(&s->g, tile->packed_headers + tile->packed_headers_size, n - 3);
925 s->g.buffer, n - 3);
926 tile->packed_headers_size += n - 3;925 tile->packed_headers_size += n - 3;
927 bytestream2_skip(&s->g, n - 3);
928 926
929 return 0;927 return 0;
930}928}

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t