* commit 'e62a43f6':
  mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext

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