videobuf core bug workaround
Merge branch 'master' into compat