upipe-x264: fix 0f3edecf
Merge branch 'master' of http://git.notk.org/bencoh/upipe