Merge "video_source.h: Minor clean up."