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)
commitbdccfc3fc354632f49721fc435310fb958843b21
tree620c1d613984edfbf1b6e873633290a43dbd7586
parent154c8bf60b65654ba28e47e5b38f70e1f1e5d90c
parentae4c912bcecb5048611c4491a818d489ec828f59
Merge remote-tracking branch 'cehoyos/master'

* 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>