Merge commit '7f4ec4364bc4a73036660c1c6a3c4801db524e9e'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:19:10 +0000 (17:19 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:19:10 +0000 (17:19 +0000)
commitad317c94c5fad00f97881263647e316344f0a81e
tree5a505dbfe80d7d795004c16a519baeb3457f8e0c
parent2bf93dfd96549777701a2031c23dac2cdb7257ee
parent7f4ec4364bc4a73036660c1c6a3c4801db524e9e
Merge commit '7f4ec4364bc4a73036660c1c6a3c4801db524e9e'

* commit '7f4ec4364bc4a73036660c1c6a3c4801db524e9e':
  avformat: expose av_stream_new_side_data helper

  Conflicts:
      libavformat/internal.h

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
doc/APIchanges
libavformat/avformat.h
libavformat/internal.h
libavformat/mov.c
libavformat/replaygain.c
libavformat/utils.c
libavformat/version.h