Merge pull request #4190 from fritsch/vdpau-disablempeg4
authorTrent Nelson <trent.a.b.nelson@gmail.com>
Thu, 13 Feb 2014 16:56:20 +0000 (09:56 -0700)
committerTrent Nelson <trent.a.b.nelson@gmail.com>
Thu, 13 Feb 2014 16:56:20 +0000 (09:56 -0700)
VDPAU: Mpeg-4/H263 is now a user setting - it must be evaluated


Trivial merge