* commit 'a1c5cc42':
  lavc: don't set AVFrame.pts to random numbers in decoders.

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