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

lavf/rawenc: Add little- and big-endian G.726 muxers.

This commit is contained in:
Carl Eugen Hoyos 2017-08-26 11:43:09 +02:00
parent 9d6aab6fa1
commit 9d494c5e55
5 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -33,7 +33,7 @@ version <next>:
- tlut2 video filter
- floodfill video filter
- pseudocolor video filter
- raw G.726 demuxer, left- and right-justified
- raw G.726 muxer and demuxer, left- and right-justified
version 3.3:
- CrystalHD decoder moved to new decode API

6
libavformat/Makefile
View File

@ -188,11 +188,13 @@ OBJS-$(CONFIG_GSM_MUXER) += rawenc.o
OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o
OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o
OBJS-$(CONFIG_G722_DEMUXER) += g722.o rawdec.o
OBJS-$(CONFIG_G726_DEMUXER) += g726.o
OBJS-$(CONFIG_G726LE_DEMUXER) += g726.o
OBJS-$(CONFIG_G722_MUXER) += rawenc.o
OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o
OBJS-$(CONFIG_G723_1_MUXER) += rawenc.o
OBJS-$(CONFIG_G726_DEMUXER) += g726.o
OBJS-$(CONFIG_G726_MUXER) += rawenc.o
OBJS-$(CONFIG_G726LE_DEMUXER) += g726.o
OBJS-$(CONFIG_G726LE_MUXER) += rawenc.o
OBJS-$(CONFIG_G729_DEMUXER) += g729dec.o
OBJS-$(CONFIG_GDV_DEMUXER) += gdv.o
OBJS-$(CONFIG_GENH_DEMUXER) += genh.o

4
libavformat/allformats.c
View File

@ -132,9 +132,9 @@ static void register_all(void)
REGISTER_DEMUXER (FRM, frm);
REGISTER_DEMUXER (FSB, fsb);
REGISTER_MUXDEMUX(G722, g722);
REGISTER_DEMUXER (G726, g726);
REGISTER_DEMUXER (G726LE, g726le);
REGISTER_MUXDEMUX(G723_1, g723_1);
REGISTER_MUXDEMUX(G726, g726);
REGISTER_MUXDEMUX(G726LE, g726le);
REGISTER_DEMUXER (G729, g729);
REGISTER_DEMUXER (GDV, gdv);
REGISTER_DEMUXER (GENH, genh);

24
libavformat/rawenc.c
View File

@ -196,6 +196,30 @@ AVOutputFormat ff_g723_1_muxer = {
};
#endif
#if CONFIG_G726_MUXER
AVOutputFormat ff_g726_muxer = {
.name = "g726",
.long_name = NULL_IF_CONFIG_SMALL("raw big-endian G.726 (\"left-justified\")"),
.audio_codec = AV_CODEC_ID_ADPCM_G726,
.video_codec = AV_CODEC_ID_NONE,
.write_header = force_one_stream,
.write_packet = ff_raw_write_packet,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
#if CONFIG_G726LE_MUXER
AVOutputFormat ff_g726le_muxer = {
.name = "g726le",
.long_name = NULL_IF_CONFIG_SMALL("raw little-endian G.726 (\"right-justified\")"),
.audio_codec = AV_CODEC_ID_ADPCM_G726LE,
.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",

2
libavformat/version.h
View File

@ -32,7 +32,7 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 77
#define LIBAVFORMAT_VERSION_MINOR 78
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \