* commit 'dc40d886':
  avconv: do not use poorly defined and undocumented AVStream.pts

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>