* commit '508998f7':
  avf: move riff tags accessors where they belong

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