Merge commit 'd246231e4714119faac6c7acd881d3b687bb8b11'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 19:05:46 +0000 (21:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 19:05:46 +0000 (21:05 +0200)
commitc01bcce4959a208a4f6b66fd527760ed45cd29bb
tree5c7c0bb45c5d3fc6ea0e1da7858da6e95802db77
parenta6ba5184a5e2a224f4f62bbb736b68dc416120fe
parentd246231e4714119faac6c7acd881d3b687bb8b11
Merge commit 'd246231e4714119faac6c7acd881d3b687bb8b11'

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

Conflicts:
libavformat/wavenc.c

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