Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Feb 2015 21:31:29 +0000 (22:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Feb 2015 21:31:32 +0000 (22:31 +0100)
* cehoyos/master:
  lavc/tscc: Make 32bit output opaque.

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

Trivial merge