[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Wed Aug 7 12:23:24 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug  7 12:14:39 2013 +0200| [e4eab2d9bde330b9893a3291cb0d00c626a9ee8c] | committer: Michael Niedermayer

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 at gmx.at>

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





More information about the ffmpeg-cvslog mailing list