Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 17:16:42 +0000 (18:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 17:16:42 +0000 (18:16 +0100)
* 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@gmx.at>

No differences found