Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: Drop a faulty assert

Conflicts:
	libavcodec/mpegvideo.c

Merge for metadata only, the change looks wrong.
Merged-by: Michael Niedermayer <michaelni@gmx.at>