[FFmpeg-cvslog] Merge commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 17:48:30 2016 +0000| [55cada301049cd3a4133ac8349d3f80db2a48b97] | committer: Derek Buitenhuis

Merge commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae'

This commit is a no-op. FFmpeg already has this.

* commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae':
  dnxhd: Make the encoder message friendlier

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55cada301049cd3a4133ac8349d3f80db2a48b97
---