
Conflicts: channels/drdynvc/client/dvcman.c include/freerdp/codec/h264.h libfreerdp/codec/h264.c after this merge h264 doesn't work anymore!! libfreerdp/utils/svc_plugin.c
Conflicts: channels/drdynvc/client/dvcman.c include/freerdp/codec/h264.h libfreerdp/codec/h264.c after this merge h264 doesn't work anymore!! libfreerdp/utils/svc_plugin.c