-
Gautier Pelloux-Prayer authored
Conflicts: include/mediastreamer2/bitratecontrol.h src/voip/bitratecontrol.c src/voip/mediastream.c src/voip/qosanalyzer.c src/voip/videostream.c
3d5dafef
Conflicts: include/mediastreamer2/bitratecontrol.h src/voip/bitratecontrol.c src/voip/mediastream.c src/voip/qosanalyzer.c src/voip/videostream.c