Merge pull request #3608 from mfleisz/msvc10_fixes
authorMartin Fleisz <martin.fleisz@thincast.com>
Tue, 22 Nov 2016 13:00:08 +0000 (14:00 +0100)
committerGitHub <noreply@github.com>
Tue, 22 Nov 2016 13:00:08 +0000 (14:00 +0100)
codec: Fix compilation with VS2010


Trivial merge