Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 01:05:36 +0000 (03:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 01:16:56 +0000 (03:16 +0200)
commit95582b5ccc9a7f7adcb28751f731960c35527e05
treef972334e1c8dcdba8ea9eaef6f372b23acf7ff2c
parent9e3c8f61feb2463c06aab4dad60de08dbee9d891
parent38389058c3308758c6365abd0f6b45c5e62bb90b
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@gmx.at>
Changelog
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/exr.c
libavcodec/utils.c
libavcodec/version.h