Merge commit '1f6e5dd4d4dd9c02371ad211049d27edb6d95286'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 19:40:11 +0000 (16:40 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 19:40:11 +0000 (16:40 -0300)
commit8b63acaeee246a9f8c72a2dc4c2074016ed91ffb
tree88e5d4ac05a41231760e1bd42633cee34517ffc0
parent21525e6d0d704e88e69eda9dc4c92a4acee347ac
parent1f6e5dd4d4dd9c02371ad211049d27edb6d95286
Merge commit '1f6e5dd4d4dd9c02371ad211049d27edb6d95286'

* commit '1f6e5dd4d4dd9c02371ad211049d27edb6d95286':
  mlp: Rename the channel layout variable

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/mlpdec.c