diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-21 22:43:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-21 23:04:02 +0100 |
| commit | 7f6a0190963f99c9b90dc58f17f8d450d2a4f98e (patch) | |
| tree | abb09c59f219c310cb4aea43441ec877dc01850f /common.mak | |
| parent | 2c28e26913df927e71d87fa851c9d950f281523b (diff) | |
| parent | 1b987c4bb03d09debceb667af5f9af897c5ab0cd (diff) | |
| download | ffmpeg-7f6a0190963f99c9b90dc58f17f8d450d2a4f98e.tar.gz | |
Merge remote-tracking branch 'mjbshaw/master'
* mjbshaw/master:
Applied patches from Michael Niedermayer to clean up the code
Added support for J2K encoding with libopenjpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions