* commit '93afb6c9':
  avconv: set output avg_frame_rate when known

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