Beta version ready for libav addon