Merge "disable vaapiupload for software decoding"
authorYan Yin <yan.yin@intel.com>
Fri, 8 Mar 2013 08:29:26 +0000 (17:29 +0900)
committerGerrit Code Review <gerrit2@kim11>
Fri, 8 Mar 2013 08:29:26 +0000 (17:29 +0900)

Trivial merge