Merge commit '42dc214323637464759354912e18b2bee1884dd1'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:46:36 +0000 (11:46 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:46:36 +0000 (11:46 +0200)
* commit '42dc214323637464759354912e18b2bee1884dd1':
  mpc: Drop unused GetBitContext context member

Merged-by: Clément Bœsch <clement@stupeflix.com>
1  2 
libavcodec/mpc.h

Simple merge