enumerated type mixed with another type

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