This reverts commit b3452771.

A better solution was implemented by Nathan Caldwell.

Conflicts:

	libavcodec/aacenc.c