[FFmpeg-cvslog] Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 20 22:20:28 2014 +0200| [0dceefc5fa81a6c851b51acab695a8c149ec8e3b] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0dceefc5fa81a6c851b51acab695a8c149ec8e3b
---