Hi! Attached patch allows to mux raw G.729 as supported by our G.729 demuxer.
Please comment, Carl Eugen
diff --git a/libavformat/Makefile b/libavformat/Makefile index 742aff5..59944b0 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -192,6 +192,7 @@ OBJS-$(CONFIG_G722_MUXER) += rawenc.o OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o OBJS-$(CONFIG_G723_1_MUXER) += rawenc.o OBJS-$(CONFIG_G729_DEMUXER) += g729dec.o +OBJS-$(CONFIG_G729_MUXER) += rawenc.o OBJS-$(CONFIG_GENH_DEMUXER) += genh.o OBJS-$(CONFIG_H261_DEMUXER) += h261dec.o rawdec.o OBJS-$(CONFIG_H261_MUXER) += rawenc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index e6ee8d6..9745074 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -137,7 +137,7 @@ void av_register_all(void) REGISTER_DEMUXER (FSB, fsb); REGISTER_MUXDEMUX(G722, g722); REGISTER_MUXDEMUX(G723_1, g723_1); - REGISTER_DEMUXER (G729, g729); + REGISTER_MUXDEMUX(G729, g729); REGISTER_DEMUXER (GENH, genh); REGISTER_MUXDEMUX(GIF, gif); REGISTER_MUXDEMUX(GSM, gsm); diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 4b8b41c..615453f 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -193,6 +193,20 @@ AVOutputFormat ff_g723_1_muxer = { }; #endif +#if CONFIG_G729_MUXER +AVOutputFormat ff_g729_muxer = { + .name = "g729", + .long_name = NULL_IF_CONFIG_SMALL("raw G.729"), + .mime_type = "audio/G729", + .extensions = "g729", + .audio_codec = AV_CODEC_ID_G729, + .video_codec = AV_CODEC_ID_NONE, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_GSM_MUXER AVOutputFormat ff_gsm_muxer = { .name = "gsm", diff --git a/libavformat/version.h b/libavformat/version.h index 7f721da..65b99ee 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 36 +#define LIBAVFORMAT_VERSION_MINOR 37 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel