har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

g723.1: use raw muxer

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Mohamed Naufal 2011-10-13 15:48:51 +05:30 committed by Michael Niedermayer
parent f884ef00de
commit 4d518f1230
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@ -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

21
libavformat/g723_1.c
View File

@ -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

13
libavformat/rawenc.c
View File

@ -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",