virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/libopenjpegdec: fix mixed declarations and code

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2016-03-25 00:04:57 -03:00
parent 0cd9ff4e3a
commit 21cd0228be
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/libopenjpegdec.c
View File

@@ -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)
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;
} }