From: Hendrik Leppkes Date: Tue, 8 Sep 2015 12:19:17 +0000 (+0200) Subject: Merge commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25' X-Git-Tag: n3.0~2931 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=94d7060d71b435d2d5bbd5d7553d926a87695992 Merge commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25' * commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25': fraps: increase vlc nb_bits Merged-by: Hendrik Leppkes --- 94d7060d71b435d2d5bbd5d7553d926a87695992