Michael Niedermayer c01bcce495 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>

2014-05-18 21:05:46 +02:00

12 KiB

Raw Blame History

View Raw