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

Conflicts:
	doc/nut.texi
	libavformat/nut.h
	libavformat/nutdec.c
	libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>