Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Jun 2013 09:49:44 +0000 (11:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Jun 2013 09:49:48 +0000 (11:49 +0200)
commit35cf069aeababf85da5b5b81f72e65268a4a1920
tree97ea08ce64314a61d8474d04b4ee8ed17dded346
parentdc60061bb6e3b2ee87a12fb3a26239d7b5a74379
parentf1c8413dc7db6749029c3be7f5933e20c965c2e3
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix compilation with --disable-everything --enable-encoder=jpeg2000

Merged-by: Michael Niedermayer <michaelni@gmx.at>