Commit b576934d authored by Reimar Döffinger's avatar Reimar Döffinger

Add native GSM 06.10 audio decoder.

Originally committed as revision 24158 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a6f8f11b
...@@ -19,6 +19,7 @@ version <next>: ...@@ -19,6 +19,7 @@ version <next>:
- RTP depacketization of SVQ3 - RTP depacketization of SVQ3
- -strict inofficial replaced by -strict unofficial - -strict inofficial replaced by -strict unofficial
- ffplay -exitonkeydown and -exitonmousedown options added - ffplay -exitonkeydown and -exitonmousedown options added
- native GSM / GSM MS decoder
......
...@@ -589,10 +589,10 @@ following image formats are supported: ...@@ -589,10 +589,10 @@ following image formats are supported:
@item Enhanced AC-3 @tab @tab X @item Enhanced AC-3 @tab @tab X
@item FLAC (Free Lossless Audio Codec) @tab X @tab IX @item FLAC (Free Lossless Audio Codec) @tab X @tab IX
@item G.729 @tab @tab X @item G.729 @tab @tab X
@item GSM @tab E @tab E @item GSM @tab E @tab X
@tab supported through external library libgsm @tab encoding supported through external library libgsm
@item GSM Microsoft variant @tab E @tab E @item GSM Microsoft variant @tab E @tab X
@tab supported through external library libgsm @tab encoding supported through external library libgsm
@item IMC (Intel Music Coder) @tab @tab X @item IMC (Intel Music Coder) @tab @tab X
@item MACE (Macintosh Audio Compression/Expansion) 3:1 @tab @tab X @item MACE (Macintosh Audio Compression/Expansion) 3:1 @tab @tab X
@item MACE (Macintosh Audio Compression/Expansion) 6:1 @tab @tab X @item MACE (Macintosh Audio Compression/Expansion) 6:1 @tab @tab X
......
...@@ -130,6 +130,8 @@ OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o huffman.o ...@@ -130,6 +130,8 @@ OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o huffman.o
OBJS-$(CONFIG_FRWU_DECODER) += frwu.o OBJS-$(CONFIG_FRWU_DECODER) += frwu.o
OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o
OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o
OBJS-$(CONFIG_GSM_DECODER) += gsmdec.o
OBJS-$(CONFIG_GSM_MS_DECODER) += gsmdec.o
OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261.o \ OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261.o \
mpegvideo.o error_resilience.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_H261_ENCODER) += h261enc.o h261.o \ OBJS-$(CONFIG_H261_ENCODER) += h261enc.o h261.o \
......
...@@ -230,6 +230,8 @@ void avcodec_register_all(void) ...@@ -230,6 +230,8 @@ void avcodec_register_all(void)
REGISTER_DECODER (DSICINAUDIO, dsicinaudio); REGISTER_DECODER (DSICINAUDIO, dsicinaudio);
REGISTER_DECODER (EAC3, eac3); REGISTER_DECODER (EAC3, eac3);
REGISTER_ENCDEC (FLAC, flac); REGISTER_ENCDEC (FLAC, flac);
REGISTER_DECODER (GSM, gsm);
REGISTER_DECODER (GSM_MS, gsm_ms);
REGISTER_DECODER (IMC, imc); REGISTER_DECODER (IMC, imc);
REGISTER_DECODER (MACE3, mace3); REGISTER_DECODER (MACE3, mace3);
REGISTER_DECODER (MACE6, mace6); REGISTER_DECODER (MACE6, mace6);
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 80 #define LIBAVCODEC_VERSION_MINOR 81
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment