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)
commit94d7060d71b435d2d5bbd5d7553d926a87695992
treec82d11ad2eeebb039ac910ef7951289b82b0b21d
parentec6b4e21bdfee5e529850e2ed8fe7f265d71abea
parentdb9fd1e9af83e88bcf2ef40db6a5debf91845c25
Merge commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25'

* commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25':
  fraps: increase vlc nb_bits

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