RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf: G.723.1 muxer 

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Mohamed Naufal 2015-11-12 14:53:26 +01:00 committed by Vittorio Giovara
parent f023d57d35
commit ca5f386e75
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -49,7 +49,7 @@ version <next>:
- innoHeim/Rsupport Screen Capture Codec decoder - innoHeim/Rsupport Screen Capture Codec decoder
- support encoding 16-bit RLE SGI images - support encoding 16-bit RLE SGI images
- support Apple AVFoundation video capture - support Apple AVFoundation video capture
- G.723.1 encoder - G.723.1 muxer and encoder
version 11: version 11:

1
libavformat/Makefile
View File

@ -138,6 +138,7 @@ OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o
OBJS-$(CONFIG_G722_DEMUXER) += g722.o rawdec.o OBJS-$(CONFIG_G722_DEMUXER) += g722.o rawdec.o
OBJS-$(CONFIG_G722_MUXER) += rawenc.o OBJS-$(CONFIG_G722_MUXER) += rawenc.o
OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o
OBJS-$(CONFIG_G723_1_MUXER) += rawenc.o
OBJS-$(CONFIG_H261_DEMUXER) += h261dec.o rawdec.o OBJS-$(CONFIG_H261_DEMUXER) += h261dec.o rawdec.o
OBJS-$(CONFIG_H261_MUXER) += rawenc.o OBJS-$(CONFIG_H261_MUXER) += rawenc.o
OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o

2
libavformat/allformats.c
View File

@ -111,7 +111,7 @@ void av_register_all(void)
REGISTER_MUXER (FRAMECRC, framecrc); REGISTER_MUXER (FRAMECRC, framecrc);
REGISTER_MUXER (FRAMEMD5, framemd5); REGISTER_MUXER (FRAMEMD5, framemd5);
REGISTER_MUXDEMUX(G722, g722); REGISTER_MUXDEMUX(G722, g722);
REGISTER_DEMUXER (G723_1, g723_1); REGISTER_MUXDEMUX(G723_1, g723_1);
REGISTER_MUXER (GIF, gif); REGISTER_MUXER (GIF, gif);
REGISTER_DEMUXER (GSM, gsm); REGISTER_DEMUXER (GSM, gsm);
REGISTER_MUXDEMUX(GXF, gxf); REGISTER_MUXDEMUX(GXF, gxf);

13
libavformat/rawenc.c
View File

@ -131,6 +131,19 @@ AVOutputFormat ff_g722_muxer = {
}; };
#endif #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 = AV_CODEC_ID_G723_1,
.video_codec = AV_CODEC_ID_NONE,
.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",

2
libavformat/version.h
View File

@ -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 1 #define LIBAVFORMAT_VERSION_MINOR 2
#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \