video options to the generic options where it belongs.

Originally committed as revision 13893 to svn://svn.ffmpeg.org/ffmpeg/trunk