* commit 'd246231e':
  wavenc: use codec descriptors to get the codec name

Conflicts:
	libavformat/wavenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>