Merge commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:19:17 +0000 (14:19 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:19:17 +0000 (14:19 +0200)
* commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25':
  fraps: increase vlc nb_bits

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge