[FFmpeg-cvslog] Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  1 03:05:36 2014 +0200| [95582b5ccc9a7f7adcb28751f731960c35527e05] | committer: Michael Niedermayer

Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'

* commit '38389058c3308758c6365abd0f6b45c5e62bb90b':
  OpenEXR decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/exr.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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