diff options
| author | Michel Bardiaux <mbardiaux@mediaxim.be> | 2007-02-20 11:09:47 +0000 |
|---|---|---|
| committer | Michel Bardiaux <mbardiaux@mediaxim.be> | 2007-02-20 11:09:47 +0000 |
| commit | 346a655d467915a2a96019104d6ec7cdd859f1f9 (patch) | |
| tree | 8c1dca31249aaaf9442dc6fab22111de687ce6d5 /libavcodec/avcodec.h | |
| parent | 758a6b3c061141af741c7dd777313f9d944ff86d (diff) | |
| download | ffmpeg-346a655d467915a2a96019104d6ec7cdd859f1f9.tar.gz | |
Add support for MS-GSM codec
Originally committed as revision 8039 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 931bc5ad56..ca734dba18 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -37,8 +37,8 @@ extern "C" { #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_VERSION_INT ((51<<16)+(33<<8)+0) -#define LIBAVCODEC_VERSION 51.33.0 +#define LIBAVCODEC_VERSION_INT ((51<<16)+(34<<8)+0) +#define LIBAVCODEC_VERSION 51.34.0 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) @@ -227,7 +227,7 @@ enum CodecID { CODEC_ID_SHORTEN, CODEC_ID_ALAC, CODEC_ID_WESTWOOD_SND1, - CODEC_ID_GSM, + CODEC_ID_GSM, /* As in Berlin toast format */ CODEC_ID_QDM2, CODEC_ID_COOK, CODEC_ID_TRUESPEECH, @@ -239,6 +239,7 @@ enum CodecID { CODEC_ID_IMC, CODEC_ID_MUSEPACK7, CODEC_ID_MLP, + CODEC_ID_GSM_MS, /* As found in WAV */ /* subtitle codecs */ CODEC_ID_DVD_SUBTITLE= 0x17000, @@ -2165,6 +2166,7 @@ extern AVCodec h264_encoder; extern AVCodec huffyuv_encoder; extern AVCodec jpegls_encoder; extern AVCodec libgsm_encoder; +extern AVCodec libgsm_ms_encoder; extern AVCodec libtheora_encoder; extern AVCodec ljpeg_encoder; extern AVCodec mdec_encoder; @@ -2242,6 +2244,7 @@ extern AVCodec interplay_dpcm_decoder; extern AVCodec interplay_video_decoder; extern AVCodec kmvc_decoder; extern AVCodec libgsm_decoder; +extern AVCodec libgsm_ms_decoder; extern AVCodec loco_decoder; extern AVCodec mace3_decoder; extern AVCodec mace6_decoder; |