[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 17 10:42:36 2013 +0200| [f90eb8cfc8c476bd8eb974fe504eb1c5a0acd55b] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f90eb8cfc8c476bd8eb974fe504eb1c5a0acd55b
---