Merge commit '066281372d90d63ca021b659abcb8faefd6bc4a6'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:47:48 +0000 (08:47 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:47:48 +0000 (08:47 +0100)
commitbe3963c8af6e3eeb8ab061dcf2dfd5da158549bf
tree80677504a16ef34877cce101fb92ad9b062123f7
parent202ed3e5e67441bdb7ace05ba6b853c0e7581448
parent066281372d90d63ca021b659abcb8faefd6bc4a6
Merge commit '066281372d90d63ca021b659abcb8faefd6bc4a6'

* commit '066281372d90d63ca021b659abcb8faefd6bc4a6':
  asfdec: Remove unused function parameters

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/asfdec_o.c