Merge commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:45:37 +0000 (11:45 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:45:37 +0000 (11:45 +0200)
* commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e':
  svq1enc: Drop unused GetBitContext context member

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

Simple merge