Fixed unused variable and parameter warnings.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Merge remote-tracking branch: upstream/master