diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-01 11:49:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-01 11:49:48 +0200 |
| commit | 35cf069aeababf85da5b5b81f72e65268a4a1920 (patch) | |
| tree | 97ea08ce64314a61d8474d04b4ee8ed17dded346 /libavfilter/vf_pixdesctest.c | |
| parent | dc60061bb6e3b2ee87a12fb3a26239d7b5a74379 (diff) | |
| parent | f1c8413dc7db6749029c3be7f5933e20c965c2e3 (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix compilation with --disable-everything --enable-encoder=jpeg2000
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_pixdesctest.c')
0 files changed, 0 insertions, 0 deletions