diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 12:02:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 12:02:11 +0200 |
| commit | b0448e51235760b6ba8e9562c1233e43e818a1f7 (patch) | |
| tree | a4bc536758c6b1e68f195978c1b752bdbdfc4613 /libavformat/data_uri.c | |
| parent | 3f0364327c32175221104799958702458be8fbd6 (diff) | |
| parent | be3271009ef893fbed9640e8edbd771685fd957b (diff) | |
| download | ffmpeg-b0448e51235760b6ba8e9562c1233e43e818a1f7.tar.gz | |
Merge commit 'be3271009ef893fbed9640e8edbd771685fd957b'
* commit 'be3271009ef893fbed9640e8edbd771685fd957b':
jpeg2000: Define the maximum decomposition levels
Conflicts:
libavcodec/jpeg2000.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/data_uri.c')
0 files changed, 0 insertions, 0 deletions