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)
commit0bdcc27d9598254e79a80f1e016227778b428dbb
tree87c268fd30634dcb7323ebe0f9c2fcb54b3776f3
parent62a82c66cd3f03e045867471c5edcc84b4d2b54e
parent4227e4fe7443733fb906f6fb6c265105e8269c74
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@gmx.at>
libavformat/internal.h
libavformat/replaygain.c
libavformat/utils.c