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)
commit162f34497114e49528e45b42e4255db9fa8260cf
tree8914ef0b916dd1ebd5b5f5b26d6665841d389949
parent55feff57cec85cfcc972d40e02af131f0cb86a34
parenta2bc8c56016d3854daae7e684c4bb00eaf5839cb
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix standalone compilation of the mov muxer with --disable-optimizations.

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