From 9c6effa57ba37d8881a213da66e23e6c25c46665 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Thu, 24 Aug 2017 13:06:06 +0200
Subject: [PATCH] lavf/rawenc: Add little- and big-endian G.726 muxers.
---
libavformat/Makefile | 2 ++
libavformat/allformats.c | 4 ++--
libavformat/rawenc.c | 24 ++++++++++++++++++++++++
libavformat/version.h | 2 +-
4 files changed, 29 insertions(+), 3 deletions(-)
@@ -189,7 +189,9 @@ 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_G726_MUXER) += rawenc.o
OBJS-$(CONFIG_G726LE_DEMUXER) += g726.o
+OBJS-$(CONFIG_G726LE_MUXER) += rawenc.o
OBJS-$(CONFIG_G722_MUXER) += rawenc.o
OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o
OBJS-$(CONFIG_G723_1_MUXER) += rawenc.o
@@ -132,8 +132,8 @@ 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(G726, g726);
+ REGISTER_MUXDEMUX(G726LE, g726le);
REGISTER_MUXDEMUX(G723_1, g723_1);
REGISTER_DEMUXER (G729, g729);
REGISTER_DEMUXER (GDV, gdv);
@@ -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_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_g726_lemuxer = {
+ .name = "g726le",
+ .long_name = NULL_IF_CONFIG_SMALL("raw little-endian G.726 (\"right-justified\")"),
+ .audio_codec = AV_CODEC_ID_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",
@@ -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, \
--
1.7.10.4