Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Feb 2015 16:31:27 +0000 (17:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Feb 2015 16:31:31 +0000 (17:31 +0100)
* cehoyos/master:
  Fix standalone compilation of the mov muxer with --disable-optimizations.

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

Trivial merge