* commit '4227e4fe':
  lavf: add a convenience function for adding side data to a stream

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