* commit '16302246':
  avconv: Add an option for automatically rotating video according to display matrix

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