* commit 'e0a1d0a2':
  mpegvideo_enc: rework direct mode check

Conflicts:
	libavcodec/mpegvideo_enc.c

See: ad985671Merged-by: Michael Niedermayer <michaelni@gmx.at>