Merge pull request #3851 from diizzyy/patch-25
authorTed Hess <thess@kitschensync.net>
Mon, 16 Jan 2017 13:04:31 +0000 (08:04 -0500)
committerGitHub <noreply@github.com>
Mon, 16 Jan 2017 13:04:31 +0000 (08:04 -0500)
sound/shine: Fix compilation with ffmpeg and minor fixes


Trivial merge