[FFmpeg-cvslog] Merge commit '7f4ec4364bc4a73036660c1c6a3c4801db524e9e'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Nov 22 17:19:10 2015 +0000| [ad317c94c5fad00f97881263647e316344f0a81e] | committer: Derek Buitenhuis

Merge commit '7f4ec4364bc4a73036660c1c6a3c4801db524e9e'

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

  Conflicts:
      libavformat/internal.h

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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