Merge pull request #2772 from bjcollins/master
authorHardening <rdp.effort@gmail.com>
Mon, 14 Dec 2015 15:08:13 +0000 (16:08 +0100)
committerHardening <rdp.effort@gmail.com>
Mon, 14 Dec 2015 15:08:13 +0000 (16:08 +0100)
tsmf updates/fixes for gstreamer decoder on X11 platform


Trivial merge