* commit '557d4c4e':
  avconv: replace AVCodecContext.time_base with framerate

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