Merge branch 'mxfenc_improvements' of https://github.com/mbouron/FFmpeg
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Jul 2012 18:40:32 +0000 (20:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Jul 2012 18:40:41 +0000 (20:40 +0200)
commit92c7ef1e30d677f29c06caf765c527c9db486861
treeba774fd50803cf2aad9b6d29ab575fbf763cabf8
parentacb52d322818694da1c1e03c82bd887cddac8f3e
parentd99001cab3573361e9fe8033348dde3a807828f1
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: Michael Niedermayer <michaelni@gmx.at>