From: Steinar Gunderson <sgunderson@bigfoot.com>
Date: Sun, 26 Sep 2010 16:22:14 +0000 (+0200)
Subject: Merge branch 'master' into lpcm_encoder
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=68d7df89e9b71815865d80bdf0ad2f80f48e8179;hp=-c;p=vlc

Merge branch 'master' into lpcm_encoder
---

68d7df89e9b71815865d80bdf0ad2f80f48e8179