Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Oct 2013 08:42:36 +0000 (10:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Oct 2013 08:42:41 +0000 (10:42 +0200)
* cehoyos/master:
  Add some necessary casts in the wtv demuxer.

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

Trivial merge