Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 14:42:44 +0000 (16:42 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 14:42:44 +0000 (16:42 +0200)
commitb27ddffbfb29f456d43c2f155eef5230b940a48b
tree85b29b1913c026ca408711e253f42a8e34a0d320
parent144fb06806664d4f3bc681ed1408383baeb515f4
parentdc70c19476e76f1118df73b5d97cc76f0e5f6f6c
Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c'

* commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c':
  lavc: Drop deprecated request_channels related functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/aac_ac3_parser.c
libavcodec/ac3dec.c
libavcodec/avcodec.h
libavcodec/dcadec.c
libavcodec/mlp_parser.c
libavcodec/mlpdec.c
libavcodec/options_table.h
libavcodec/version.h