Merge pull request #4889 from akallabeth/shadow_server_audin_refactor

author Martin Fleisz <martin.fleisz@thincast.com>

Mon, 8 Oct 2018 10:56:09 +0000 (12:56 +0200)

committer GitHub <noreply@github.com>

Mon, 8 Oct 2018 10:56:09 +0000 (12:56 +0200)
author Martin Fleisz <martin.fleisz@thincast.com>
Mon, 8 Oct 2018 10:56:09 +0000 (12:56 +0200)
committer GitHub <noreply@github.com>
Mon, 8 Oct 2018 10:56:09 +0000 (12:56 +0200)
diff --cc channels/audin/client/audin_main.c
Simple merge
diff --cc channels/audin/client/opensles/audin_opensl_es.c
Simple merge
diff --cc libfreerdp/codec/dsp_ffmpeg.c
Simple merge
author	Martin Fleisz <martin.fleisz@thincast.com>
	Mon, 8 Oct 2018 10:56:09 +0000 (12:56 +0200)
committer	GitHub <noreply@github.com>
	Mon, 8 Oct 2018 10:56:09 +0000 (12:56 +0200)
		1	2
channels/audin/client/audin_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
channels/audin/client/opensles/audin_opensl_es.c	patch \|	diff1 \|	diff2 \|	blob \| history
libfreerdp/codec/dsp_ffmpeg.c	patch \|	diff1 \|	diff2 \|	blob \| history