Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jul 2013 07:43:29 +0000 (09:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jul 2013 07:43:29 +0000 (09:43 +0200)
commite8023dbaf0db494f9676a251cb05792dbf3758be
tree2b53d4e4e3cc0118935c2d67a892fe41ab9a616b
parent90279285227914dabf2cd011b186d2182291363a
parent979e9e8f3671d49463fd309dcd3d9c445a4c63de
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Drop some casts that now are unnecessary

Conflicts:
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/wtvdec.c