diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 12:14:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 12:14:39 +0200 |
| commit | e4eab2d9bde330b9893a3291cb0d00c626a9ee8c (patch) | |
| tree | db03f89ac9f81ca2bcc685adf86e336cfacfde9e /COPYING.GPLv2 | |
| parent | 6bf6d6ad498d760bb60b6973789ebbf9758c999e (diff) | |
| parent | f544c586364e157e52ecc8697bee77d342150999 (diff) | |
| download | ffmpeg-e4eab2d9bde330b9893a3291cb0d00c626a9ee8c.tar.gz | |
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>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions