[FFmpeg-cvslog] Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 29 13:58:57 2012 +0100| [d7b20bfbb582c369518c73720fb4b0266714cde6] | committer: Michael Niedermayer

Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'

* commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66':
  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 at gmx.at>

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