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)
* 'mxfenc_improvements' of https://github.com/mbouron/FFmpeg:
  mxfenc: support dnxhd codec
  mxfenc: support smpte dv codec

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge