Merge branch 'fec' into trunk

Conflicts:
	ultragrid/src/main.c
	ultragrid/src/rtp/decoders.c
	ultragrid/src/rtp/rtp_callback.h
	ultragrid/src/transmit.c
	ultragrid/src/transmit.h
	ultragrid/src/video_display/gl.c