This was accidentally overwritten in the recent merge of the theora/vorbis codepaths

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