Michael Niedermayer e4eab2d9bd Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead

Conflicts:
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h

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

2013-08-07 12:14:39 +02:00

23 KiB

Raw Blame History

View Raw