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>
Showing
Please
register
or
sign in
to comment