Removed unnecessary height and width declarations

Cleaned up video format handling by removing unnecessary height and width declarations
Removed redundant feedNum addoption
resolving merge conflicts
merging new_video to master