diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 22:20:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 22:38:53 +0100 |
| commit | a048bd44b2563dc453e0c97bdca60cf028feaf50 (patch) | |
| tree | 9160697af0c020fe8841326e81eff6e08670cd11 /libavcodec/jpeg2000dwt.h | |
| parent | 79f013a206394bfc90bbb72995f5cf8965181f51 (diff) | |
| parent | 117b432748ca87de4cd0f09d9b1495545e264733 (diff) | |
| download | ffmpeg-a048bd44b2563dc453e0c97bdca60cf028feaf50.tar.gz | |
Merge commit '117b432748ca87de4cd0f09d9b1495545e264733'
* commit '117b432748ca87de4cd0f09d9b1495545e264733':
lavc: Introduce AVCodec internal capabilities
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dwt.h')
0 files changed, 0 insertions, 0 deletions