Merge commit '970c76f32283bddf3a5afd24fe52db7a96186244'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:20:45 +0000 (17:20 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:20:45 +0000 (17:20 -0300)
commit34542ac033f81601fd4dd684e993cc1716bb9a4d
tree06aa634cdc41b96b0f7bfc97f634ab73f1bcd99f
parent9484b9f4ba66a96b9b565f33f1eeb6e9b9b79e96
parent970c76f32283bddf3a5afd24fe52db7a96186244
Merge commit '970c76f32283bddf3a5afd24fe52db7a96186244'

* commit '970c76f32283bddf3a5afd24fe52db7a96186244':
  mlp_parser: Drop in-parser downmix functionality

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