diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-21 00:20:28 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-21 00:20:28 +0400 |
| commit | 0dceefc5fa81a6c851b51acab695a8c149ec8e3b (patch) | |
| tree | d26bf3f752e6fa622d14f44e091930004b2d12de /libavcodec/exr.c | |
| parent | 329898aa45f5f8e8b89386ecd40b8db96746d53c (diff) | |
| parent | 9e500efdbe0deeff1602500ebc229a0a6b6bb1a2 (diff) | |
Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'
* commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2':
Add av_image_check_sar() and use it to validate SAR
Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/ffv1dec.c
libavcodec/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/exr.c')
| -rw-r--r-- | libavcodec/exr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 6ade66cb39..62e8521adc 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1191,8 +1191,8 @@ static int decode_header(EXRContext *s) if (!var_size) return AVERROR_INVALIDDATA; - s->avctx->sample_aspect_ratio = - av_d2q(av_int2float(bytestream2_get_le32(&s->gb)), 255); + ff_set_sar(s->avctx, + av_d2q(av_int2float(bytestream2_get_le32(&s->gb)), 255)); continue; } else if ((var_size = check_header_variable(s, "compression", |