Assorted compile fixes

Conflicts:
	libavformat/nutdec.c

Change-Id: Ia222bfc719f89becd3f0c902a01d3e5cec305054