(cherry picked from commit 163013c724) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
163013c724