Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Jun 2014 20:20:28 +0000 (22:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Jun 2014 20:20:28 +0000 (22:20 +0200)
commit0dceefc5fa81a6c851b51acab695a8c149ec8e3b
treed26bf3f752e6fa622d14f44e091930004b2d12de
parent329898aa45f5f8e8b89386ecd40b8db96746d53c
parent9e500efdbe0deeff1602500ebc229a0a6b6bb1a2
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>
19 files changed:
doc/APIchanges
libavcodec/dirac.c
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/exr.c
libavcodec/ffv1dec.c
libavcodec/h263dec.c
libavcodec/h264_slice.c
libavcodec/hevc.c
libavcodec/internal.h
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/truemotion1.c
libavcodec/utils.c
libavcodec/vc1.c
libavcodec/vp3.c
libavutil/imgutils.c
libavutil/imgutils.h
libavutil/version.h