[FFmpeg-cvslog] Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 18:16:42 2015 +0100| [0bdcc27d9598254e79a80f1e016227778b428dbb] | committer: Michael Niedermayer

Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'

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

Conflicts:
	libavformat/internal.h
	libavformat/replaygain.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bdcc27d9598254e79a80f1e016227778b428dbb
---