-
jehan authored
Conflicts: include/mediastreamer2/msvideo.h src/Makefile.am src/msvideo.c src/opengles_display.c src/scaler.c src/videostream.c tests/mediastream.c
021c5cd8
Conflicts: include/mediastreamer2/msvideo.h src/Makefile.am src/msvideo.c src/opengles_display.c src/scaler.c src/videostream.c tests/mediastream.c