Merge commit '94c54d97e7f4fe90570c323803f2bdf6246c1010'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 19:52:36 +0000 (16:52 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 19:52:36 +0000 (16:52 -0300)
commite3ebc293c624ff4cb9e225c269a466290788bb55
tree792f73e38fac802369f02a9beb76b76fd4c3ec72
parent1242a6170e93351b519a0b92861654d5ff14d8dc
parent94c54d97e7f4fe90570c323803f2bdf6246c1010
Merge commit '94c54d97e7f4fe90570c323803f2bdf6246c1010'

* commit '94c54d97e7f4fe90570c323803f2bdf6246c1010':
  mlp: Factor out channel layout subset checks

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