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

  Conflicts:
      libavformat/internal.h
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>