diff options
| author | Mohamed Naufal <naufal22@gmail.com> | 2011-10-10 02:48:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-10 02:58:18 +0200 |
| commit | 19562b68cbb890d99bb7750e7a3320d0e5b9cc4f (patch) | |
| tree | fccbfa4351bde78ce41633de8ef463e47570b4f1 /libavformat | |
| parent | 059707ee2d71c3b2ae94b240559d893b1eeda903 (diff) | |
| download | ffmpeg-19562b68cbb890d99bb7750e7a3320d0e5b9cc4f.tar.gz | |
g723.1 muxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/g723_1.c | 21 |
3 files changed, 23 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 0251944bd8..fa6f89b082 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -99,6 +99,7 @@ OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o OBJS-$(CONFIG_G722_DEMUXER) += rawdec.o OBJS-$(CONFIG_G722_MUXER) += rawenc.o OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o +OBJS-$(CONFIG_G723_1_MUXER) += g723_1.o OBJS-$(CONFIG_H261_DEMUXER) += h261dec.o rawdec.o OBJS-$(CONFIG_H261_MUXER) += rawenc.o OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index ca4a3d1b4b..7a07b44b7f 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -100,7 +100,7 @@ void av_register_all(void) REGISTER_MUXER (FRAMECRC, framecrc); REGISTER_MUXER (FRAMEMD5, framemd5); REGISTER_MUXDEMUX (G722, g722); - REGISTER_DEMUXER (G723_1, g723_1); + REGISTER_MUXDEMUX (G723_1, g723_1); REGISTER_MUXER (GIF, gif); REGISTER_DEMUXER (GSM, gsm); REGISTER_MUXDEMUX (GXF, gxf); diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index 19441a1b19..f6c394b18a 100644 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -81,3 +81,24 @@ AVInputFormat ff_g723_1_demuxer = { .extensions = "tco,rco", .flags = AVFMT_GENERIC_INDEX }; + +#if CONFIG_G723_1_MUXER +static int g723_1_write_packet(AVFormatContext *s, AVPacket *pkt) +{ + put_buffer(s->pb, pkt->data, pkt->size); + put_flush_packet(s->pb); + return 0; +} + +AVOutputFormat ff_g723_1_muxer = { + "g723_1", + NULL_IF_CONFIG_SMALL("G.723.1 format"), + "audio/g723", + "tco", + 0, + CODEC_ID_G723_1, + CODEC_ID_NONE, + NULL, + g723_1_write_packet, +}; +#endif |