Michael Niedermayer 0bdcc27d95 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>

2015-01-27 18:16:42 +01:00

3.0 KiB

Raw Blame History

View Raw