Merge commit '12ab667e219e7fbf8e9aef3731039b75c822df25'
authorJames Almer <jamrial@gmail.com>
Tue, 4 Apr 2017 18:07:57 +0000 (15:07 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 4 Apr 2017 18:07:57 +0000 (15:07 -0300)
commitcaf3c5b27f031ee9d6ddaf2c7cc53d47f8f6b185
treeab0166cb63eb6fca4db4642c5517b661e4ccd07a
parent22164971b0b1ef5c7628fc2ec1eafb768fa449ac
parent12ab667e219e7fbf8e9aef3731039b75c822df25
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
2ab50647ff653ab45d9d78203b6a671124609991
77f033eb98d0d7d05f3aa238409d87fb1f6096b3
2343f23e4d7e0d0f6adfd83d7d769a7a115dbd17

Merged-by: James Almer <jamrial@gmail.com>