correct Pause key sequence
Merge pull request #1887 from dpoe/stable-1.1

correct Pause key sequence
CODEC_ID_* -> AV_CODEC_ID_*
Backwards compat defines

Conflicts:
	channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
Merge pull request #2030 from bmiklautz/fix/stable-1.1/ffmpeg

build: fix tsmf ffmpeg
build: fix tsmf ffmpeg build

Backported fixes to build against libavcodec >= 9.0
Merge pull request #2031 from bmiklautz/fix/stable-1.1/ffmpeg2

build: fix tsmf ffmpeg build
handle user@corp.net username correctly
Merge pull request #2040 from dpoe/stable-1.1

handle user@corp.net username correctly
Get rid of winpr/config.h

winpr/config.h just contains WITH_NATIVE_SSPI which is already
defined in top level config.h.
Merge pull request #2061 from bmiklautz/remove_winpr_configh

Get rid of winpr/config.h
Merge remote-tracking branch 'upstream/stable-1.1' into stable-1.1
Update to latest version of stable-1.1 from upstream