* commit '5c7bf2dd':
  lavf: move nuv fourcc audio tags from riff to nuv
  lavf: add a common function for selecting a pcm codec from parameters

Conflicts:
	libavformat/internal.h
	libavformat/mov.c
	libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>