[FFmpeg-cvslog] Merge commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 30 21:08:45 2014 +0200| [f22d9b1e0b63ef25ba62c06e2ebf55a76614da67] | committer: Michael Niedermayer

Merge commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d'

* commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d':
  dnxhdenc: return meaningful return codes

Conflicts:
	libavcodec/dnxhdenc.c

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

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