Merge pull request #4053 from akallabeth/ffmpeg_encoder

author David Fort <rdp.effort@gmail.com>

Mon, 6 Nov 2017 10:25:48 +0000 (11:25 +0100)

committer GitHub <noreply@github.com>

Mon, 6 Nov 2017 10:25:48 +0000 (11:25 +0100)
author David Fort <rdp.effort@gmail.com>
Mon, 6 Nov 2017 10:25:48 +0000 (11:25 +0100)
committer GitHub <noreply@github.com>
Mon, 6 Nov 2017 10:25:48 +0000 (11:25 +0100)
diff --cc server/shadow/shadow_client.c
Simple merge
diff --cc server/shadow/shadow_encoder.c
Simple merge
author	David Fort <rdp.effort@gmail.com>
	Mon, 6 Nov 2017 10:25:48 +0000 (11:25 +0100)
committer	GitHub <noreply@github.com>
	Mon, 6 Nov 2017 10:25:48 +0000 (11:25 +0100)
		1	2
server/shadow/shadow_client.c	patch \|	diff1 \|	diff2 \|	blob \| history
server/shadow/shadow_encoder.c	patch \|	diff1 \|	diff2 \|	blob \| history