do not overwrite codec type if already known, fix conflict between 'raw ' fourcc used for audio and video, ae002_wordup.mov

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