* qatar/master: vmdav: convert to bytestream2 FATE: add a test for the join filter FATE: add a test for the volume filter Conflicts: libavcodec/vmdav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>