Commit 92c7ef1e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge branch 'mxfenc_improvements' of https://github.com/mbouron/FFmpeg

* 'mxfenc_improvements' of https://github.com/mbouron/FFmpeg:
  mxfenc: support dnxhd codec
  mxfenc: support smpte dv codec
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents acb52d32 d99001ca
This diff is collapsed.
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