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)
commitf90eb8cfc8c476bd8eb974fe504eb1c5a0acd55b
treefce02a090a8fd8dbb4e72b156d98c87d564a8257
parent56cf6151ae9f4304d10bbe36930d0eceef59fca2
parenta0d13d84a928110b0e99ea16d17fd758fcbde35f
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add some necessary casts in the wtv demuxer.

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