Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 2 Aug 2013 22:45:02 +0000 (00:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 2 Aug 2013 22:45:08 +0000 (00:45 +0200)
* cehoyos/master:
  Forward interlaced field information from mov to ffv1 decoder.
  Do not suggest to use gas-preprocessor if using it would break compilation.

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

Trivial merge