* commit '71e92414':
  lavf: move RIFF INFO tag writing from avienc to riff
  avconv: fix disabling auto mappings with -map_metadata

Conflicts:
	ffmpeg_opt.c
	libavformat/riff.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>