quick change to the wrapper
Merge code with libav