diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:05:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:16:56 +0200 |
| commit | 95582b5ccc9a7f7adcb28751f731960c35527e05 (patch) | |
| tree | f972334e1c8dcdba8ea9eaef6f372b23acf7ff2c /libavcodec/g722enc.c | |
| parent | 9e3c8f61feb2463c06aab4dad60de08dbee9d891 (diff) | |
| parent | 38389058c3308758c6365abd0f6b45c5e62bb90b (diff) | |
| download | ffmpeg-95582b5ccc9a7f7adcb28751f731960c35527e05.tar.gz | |
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>
Diffstat (limited to 'libavcodec/g722enc.c')
0 files changed, 0 insertions, 0 deletions