diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-08-26 11:43:09 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-08-26 11:43:09 +0200 |
| commit | 9d494c5e553fe3430df2fde0c456a723ae15f4ab (patch) | |
| tree | b8ea261219ef8efd864d535cca7812df058c71c3 | |
| parent | 9d6aab6fa160f0b7528dafb741573b7d0de3b0eb (diff) | |
lavf/rawenc: Add little- and big-endian G.726 muxers.
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 6 | ||||
| -rw-r--r-- | libavformat/allformats.c | 4 | ||||
| -rw-r--r-- | libavformat/rawenc.c | 24 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
5 files changed, 32 insertions, 6 deletions
@@ -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 diff --git a/libavformat/Makefile b/libavformat/Makefile index 8e2afb76fd..f2b465cfa2 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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 diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 78ff2ebf29..cd8200ea1c 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -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); diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 26baa850e1..f640121cb4 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -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", diff --git a/libavformat/version.h b/libavformat/version.h index a8cf4c158e..94081aca81 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -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, \ |