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)
commitc7253353f8f1ce18ceaca00f0482e35b7fa34069
tree766a28395debf86933fae0bc33014d22f2db72f8
parentf8beca6f108141a017dfce882bfe31ef93a35193
parent85b8403c6fd11e1c570caa970c7f435ac5f9583e
Merge commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e'

* commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e':
  svq1enc: Drop unused GetBitContext context member

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