Merge commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:42:31 +0000 (15:42 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:42:55 +0000 (15:42 +0100)
commit18cdef9ab7d713e4320318c6fd733f3ba958864f
tree0d6d8e94ba7daa813523a3730f88463dab0a2d89
parent8e950c9b4235bb66f3bf53608417c7cbc8148740
parenta972fc1c0ab6e7f169f9145d6da46e8cedbc291c
Merge commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c'

* commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c':
  wma: Kill non-compiling disabled cruft

See 0755033f8af774cea34566adec455fbafd9f66bc

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/wma.c