Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 12:58:57 +0000 (13:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 13:00:44 +0000 (14:00 +0100)
commitd7b20bfbb582c369518c73720fb4b0266714cde6
tree27dfaa2c3e2f273e661555336b6ed6d6b9eb9e5e
parent076300bf8b43d5d56a91cd2ad845d596969c87cf
parent5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66
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@gmx.at>
libavformat/internal.h
libavformat/mov.c
libavformat/nuv.c
libavformat/riff.c
libavformat/utils.c