virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

lavc/exr: Move setting SAR down.

Browse Source 
Fixes a theoretical issue if the resolution attribute is written
behind the aspect attribute.
This commit is contained in:
Carl Eugen Hoyos 2016-01-30 13:38:16 +01:00
parent d391feff54
commit 31f5fa21b0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/exr.c
View File

@ -1030,7 +1030,7 @@ static int check_header_variable(EXRContext *s,
static int decode_header(EXRContext *s) static int decode_header(EXRContext *s)
{ {
int current_channel_offset = 0; int current_channel_offset = 0;
int magic_number, version, flags, i; int magic_number, version, flags, i, sar = 0;
s->xmin = ~0; s->xmin = ~0;
s->xmax = ~0; s->xmax = ~0;
@ -1227,8 +1227,7 @@ static int decode_header(EXRContext *s)
if (!var_size) if (!var_size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
ff_set_sar(s->avctx, sar = bytestream2_get_le32(&s->gb);
av_d2q(av_int2float(bytestream2_get_le32(&s->gb)), 255));
continue; continue;
} else if ((var_size = check_header_variable(s, "compression", } else if ((var_size = check_header_variable(s, "compression",
@ -1259,6 +1258,8 @@ static int decode_header(EXRContext *s)
bytestream2_skip(&s->gb, bytestream2_get_le32(&s->gb)); bytestream2_skip(&s->gb, bytestream2_get_le32(&s->gb));
} }
ff_set_sar(s->avctx, av_d2q(av_int2float(sar), 255));
if (s->compression == EXR_UNKN) { if (s->compression == EXR_UNKN) {
av_log(s->avctx, AV_LOG_ERROR, "Missing compression attribute.\n"); av_log(s->avctx, AV_LOG_ERROR, "Missing compression attribute.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;