Option passing support will be submitted seperately to the ML Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>