Conflicts: include/mediastreamer2/msfilter.h src/voip/videostream.c tester/mediastreamer2_adaptive_tester.c