Commit 21cd0228 authored by James Almer's avatar James Almer

avcodec/libopenjpegdec: fix mixed declarations and code

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 0cd9ff4e
...@@ -126,10 +126,12 @@ typedef struct BufferReader { ...@@ -126,10 +126,12 @@ typedef struct BufferReader {
static OPJ_SIZE_T stream_read(void *out_buffer, OPJ_SIZE_T nb_bytes, void *user_data) static OPJ_SIZE_T stream_read(void *out_buffer, OPJ_SIZE_T nb_bytes, void *user_data)
{ {
BufferReader *reader = user_data; BufferReader *reader = user_data;
int remaining;
if (reader->pos == reader->size) { if (reader->pos == reader->size) {
return (OPJ_SIZE_T)-1; return (OPJ_SIZE_T)-1;
} }
int remaining = reader->size - reader->pos; remaining = reader->size - reader->pos;
if (nb_bytes > remaining) { if (nb_bytes > remaining) {
nb_bytes = remaining; nb_bytes = remaining;
} }
...@@ -149,10 +151,12 @@ static OPJ_OFF_T stream_skip(OPJ_OFF_T nb_bytes, void *user_data) ...@@ -149,10 +151,12 @@ static OPJ_OFF_T stream_skip(OPJ_OFF_T nb_bytes, void *user_data)
nb_bytes = -reader->pos; nb_bytes = -reader->pos;
} }
} else { } else {
int remaining;
if (reader->pos == reader->size) { if (reader->pos == reader->size) {
return (OPJ_SIZE_T)-1; return (OPJ_SIZE_T)-1;
} }
int remaining = reader->size - reader->pos; remaining = reader->size - reader->pos;
if (nb_bytes > remaining) { if (nb_bytes > remaining) {
nb_bytes = remaining; nb_bytes = remaining;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment