[FFmpeg-cvslog] Merge commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep  8 14:19:17 2015 +0200| [94d7060d71b435d2d5bbd5d7553d926a87695992] | committer: Hendrik Leppkes

Merge commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25'

* commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25':
  fraps: increase vlc nb_bits

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94d7060d71b435d2d5bbd5d7553d926a87695992
---