Merge commit '12ab667e219e7fbf8e9aef3731039b75c822df25'

* commit '12ab667e219e7fbf8e9aef3731039b75c822df25':
  matroska: use av_stream_add_side_data() for stereo3d side data
  mov: Use av_stream_add_side_data() for displaymatrix side data
  utils: Add av_stream_add_side_data()

This is a noop, see
2ab50647ff
77f033eb98
2343f23e4d

Merged-by: James Almer <jamrial@gmail.com>
pull/117/merge
James Almer 8 years ago
commit caf3c5b27f

Diff Content Not Available