generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2014-06-20 22:20:28 +02:00
parent 329898aa45 9e500efdbe
commit 0dceefc5fa
19 changed files with 120 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/exr.c
View File

@@ -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",