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)
* cehoyos/master:
  Fix compilation with --disable-everything --enable-encoder=jpeg2000

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

Trivial merge