Commit caf3c5b2 authored by James Almer's avatar James Almer

Merge commit '12ab667e'

* commit '12ab667e':
  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
2ab50647
77f033eb
2343f23eMerged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 22164971 12ab667e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment