This reverts commit a50f0bea.

This has been implemented differently in qatar and its better they
maintain it for me instead of me having to spend an average 5sec more
per merge

Conflicts:

	libavcodec/h264.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>