* commit '6a27ae28':
  mpegvideo: treat delayed pictures as used

Conflicts:
	libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>