diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:28:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:29:17 +0100 |
| commit | 4aa48e467b1cce80aa937114c1a8c88bb893c320 (patch) | |
| tree | 74b916f5c88c76db861a631c58bf43daac07aac7 /libavformat/audiointerleave.c | |
| parent | 0cf6b3b5b79f5f8e37645121333aa67e8266e0c6 (diff) | |
| parent | fb0a988f94c3b8907610172295a7f6bf78c57105 (diff) | |
| download | ffmpeg-4aa48e467b1cce80aa937114c1a8c88bb893c320.tar.gz | |
Merge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'
* commit 'fb0a988f94c3b8907610172295a7f6bf78c57105':
riff: IPJ2 decodes with JPEG2000 decoder
See: b18c27def898e7499cf36b65b5debc4f303e7e5b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/audiointerleave.c')
0 files changed, 0 insertions, 0 deletions