[FFmpeg-cvslog] Merge commit 'd246231e4714119faac6c7acd881d3b687bb8b11'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 21:05:46 2014 +0200| [c01bcce4959a208a4f6b66fd527760ed45cd29bb] | committer: Michael Niedermayer

Merge commit 'd246231e4714119faac6c7acd881d3b687bb8b11'

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

Conflicts:
	libavformat/wavenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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