Commit b0c026a2 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavf/rawenc: Add a raw gsm muxer.

parent 56cb465b
...@@ -181,6 +181,7 @@ OBJS-$(CONFIG_FSB_DEMUXER) += fsb.o ...@@ -181,6 +181,7 @@ OBJS-$(CONFIG_FSB_DEMUXER) += fsb.o
OBJS-$(CONFIG_GIF_MUXER) += gif.o OBJS-$(CONFIG_GIF_MUXER) += gif.o
OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.o OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.o
OBJS-$(CONFIG_GSM_DEMUXER) += gsmdec.o OBJS-$(CONFIG_GSM_DEMUXER) += gsmdec.o
OBJS-$(CONFIG_GSM_MUXER) += rawenc.o
OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o
OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o
OBJS-$(CONFIG_G722_DEMUXER) += g722.o rawdec.o OBJS-$(CONFIG_G722_DEMUXER) += g722.o rawdec.o
......
...@@ -139,7 +139,7 @@ void av_register_all(void) ...@@ -139,7 +139,7 @@ void av_register_all(void)
REGISTER_DEMUXER (G729, g729); REGISTER_DEMUXER (G729, g729);
REGISTER_DEMUXER (GENH, genh); REGISTER_DEMUXER (GENH, genh);
REGISTER_MUXDEMUX(GIF, gif); REGISTER_MUXDEMUX(GIF, gif);
REGISTER_DEMUXER (GSM, gsm); REGISTER_MUXDEMUX(GSM, gsm);
REGISTER_MUXDEMUX(GXF, gxf); REGISTER_MUXDEMUX(GXF, gxf);
REGISTER_MUXDEMUX(H261, h261); REGISTER_MUXDEMUX(H261, h261);
REGISTER_MUXDEMUX(H263, h263); REGISTER_MUXDEMUX(H263, h263);
......
...@@ -193,6 +193,20 @@ AVOutputFormat ff_g723_1_muxer = { ...@@ -193,6 +193,20 @@ AVOutputFormat ff_g723_1_muxer = {
}; };
#endif #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 #if CONFIG_H261_MUXER
AVOutputFormat ff_h261_muxer = { AVOutputFormat ff_h261_muxer = {
.name = "h261", .name = "h261",
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 31 #define LIBAVFORMAT_VERSION_MINOR 32
#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
......
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