enabled.  Also fixes some "defined but not used" warnings in that case.

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