Fixes icc warning #188: enumerated type mixed with another type Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk Originally committed as revision 13046 to svn://svn.ffmpeg.org/ffmpeg/trunk