diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-04-09 11:44:50 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-04-09 11:44:50 +0200 |
| commit | b0c026a27f9498b8f118684a2830ca7df7eae374 (patch) | |
| tree | 9cee6d1f33e57d337cb18793f30512e2665d6c6e /libavformat | |
| parent | 56cb465b38ab29afedd502c1e2ad66e6dce16b93 (diff) | |
| download | ffmpeg-b0c026a27f9498b8f118684a2830ca7df7eae374.tar.gz | |
lavf/rawenc: Add a raw gsm muxer.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/rawenc.c | 14 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
4 files changed, 17 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 5515b84c0c..5921368b9e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -181,6 +181,7 @@ OBJS-$(CONFIG_FSB_DEMUXER) += fsb.o OBJS-$(CONFIG_GIF_MUXER) += gif.o OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.o OBJS-$(CONFIG_GSM_DEMUXER) += gsmdec.o +OBJS-$(CONFIG_GSM_MUXER) += rawenc.o OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o OBJS-$(CONFIG_G722_DEMUXER) += g722.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index c5aa093f57..d7023eaad1 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -139,7 +139,7 @@ void av_register_all(void) REGISTER_DEMUXER (G729, g729); REGISTER_DEMUXER (GENH, genh); REGISTER_MUXDEMUX(GIF, gif); - REGISTER_DEMUXER (GSM, gsm); + REGISTER_MUXDEMUX(GSM, gsm); REGISTER_MUXDEMUX(GXF, gxf); REGISTER_MUXDEMUX(H261, h261); REGISTER_MUXDEMUX(H263, h263); diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 358ee4e2f0..14ba9fbf47 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -193,6 +193,20 @@ AVOutputFormat ff_g723_1_muxer = { }; #endif +#if CONFIG_GSM_MUXER +AVOutputFormat ff_gsm_muxer = { + .name = "gsm", + .long_name = NULL_IF_CONFIG_SMALL("raw GSM"), + .mime_type = "audio/x-gsm", + .extensions = "gsm", + .audio_codec = AV_CODEC_ID_GSM, + .video_codec = AV_CODEC_ID_NONE, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_H261_MUXER AVOutputFormat ff_h261_muxer = { .name = "h261", diff --git a/libavformat/version.h b/libavformat/version.h index 29047ab106..92a77efb11 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 31 +#define LIBAVFORMAT_VERSION_MINOR 32 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |