diff options
| author | Mohamed Naufal <naufal11@gmail.com> | 2011-10-13 15:48:51 +0530 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-13 16:50:20 +0200 |
| commit | 4d518f123029f6cda1d3875902bbf9566c1fa76f (patch) | |
| tree | 3fdca7b86f2acb8d15640e286ed5d00eca66ef43 | |
| parent | f884ef00de362a5460a9c58318d009bcae440cc8 (diff) | |
g723.1: use raw muxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/g723_1.c | 21 | ||||
| -rw-r--r-- | libavformat/rawenc.c | 13 |
3 files changed, 14 insertions, 22 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index fa6f89b082..fc75517e31 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -99,7 +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_G723_1_MUXER) += rawenc.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/g723_1.c b/libavformat/g723_1.c index f6c394b18a..19441a1b19 100644 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -81,24 +81,3 @@ 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 diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index d0857dea05..b2ff79abf3 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -108,6 +108,19 @@ AVOutputFormat ff_g722_muxer = { }; #endif +#if CONFIG_G723_1_MUXER +AVOutputFormat ff_g723_1_muxer = { + .name = "g723_1", + .long_name = NULL_IF_CONFIG_SMALL("raw G.723.1"), + .mime_type = "audio/g723", + .extensions = "tco,rco", + .audio_codec = CODEC_ID_G723_1, + .video_codec = CODEC_ID_NONE, + .write_packet = ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_H261_MUXER AVOutputFormat ff_h261_muxer = { .name = "h261", |