[FFmpeg-cvslog] Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 29 01:09:51 2014 +0200| [a8499cbbe87d00456c391f41207e1981bd7f746a] | committer: Michael Niedermayer

Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'

* commit 'c94e2e85cb6af8a570d8542a830556243bd32873':
  nut: Support experimental NUT 4 features

Conflicts:
	doc/nut.texi
	libavformat/nut.h
	libavformat/nutdec.c
	libavformat/nutenc.c

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

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