VideoCommon: small cleanups.  No functional change.
Merge pull request #502 from magumagu/video-common-small-cleanup

VideoCommon: small cleanups.