[FFmpeg-cvslog] sbc: add raw muxer for SBC

[Aurelien Jacobs]

ffmpeg | branch: master | Aurelien Jacobs <aurel at gnuage.org> | Sun Dec 17 20:24:21 2017 +0100| [88508a87a55789672ce0eb66ccd23fda38eab5af] | committer: Aurelien Jacobs

sbc: add raw muxer for SBC

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88508a87a55789672ce0eb66ccd23fda38eab5af
---

 doc/general.texi         |  2 +-
 libavformat/Makefile     |  1 +
 libavformat/allformats.c |  1 +
 libavformat/rawenc.c     | 13 +++++++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/doc/general.texi b/doc/general.texi
index de13a7695e..c5d46d3404 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -501,7 +501,7 @@ library:
 @item raw NULL                  @tab X @tab
 @item raw video                 @tab X @tab X
 @item raw id RoQ                @tab X @tab
- at item raw SBC                   @tab   @tab X
+ at item raw SBC                   @tab X @tab X
 @item raw Shorten               @tab   @tab X
 @item raw TAK                   @tab   @tab X
 @item raw TrueHD                @tab X @tab X
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 3fad2cb043..e64c5b30a1 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -453,6 +453,7 @@ OBJS-$(CONFIG_SAMI_DEMUXER)              += samidec.o subtitles.o
 OBJS-$(CONFIG_SAP_DEMUXER)               += sapdec.o
 OBJS-$(CONFIG_SAP_MUXER)                 += sapenc.o
 OBJS-$(CONFIG_SBC_DEMUXER)               += sbcdec.o rawdec.o
+OBJS-$(CONFIG_SBC_MUXER)                 += rawenc.o
 OBJS-$(CONFIG_SBG_DEMUXER)               += sbgdec.o
 OBJS-$(CONFIG_SCC_DEMUXER)               += sccdec.o subtitles.o
 OBJS-$(CONFIG_SCC_MUXER)                 += sccenc.o subtitles.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 9c7f687a8e..9dc5ce8a76 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -355,6 +355,7 @@ extern AVInputFormat  ff_sami_demuxer;
 extern AVInputFormat  ff_sap_demuxer;
 extern AVOutputFormat ff_sap_muxer;
 extern AVInputFormat  ff_sbc_demuxer;
+extern AVOutputFormat ff_sbc_muxer;
 extern AVInputFormat  ff_sbg_demuxer;
 extern AVInputFormat  ff_scc_demuxer;
 extern AVOutputFormat ff_scc_muxer;
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index fcfbfbce8e..809ca23b1a 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -452,6 +452,19 @@ AVOutputFormat ff_rawvideo_muxer = {
 };
 #endif
 
+#if CONFIG_SBC_MUXER
+AVOutputFormat ff_sbc_muxer = {
+    .name              = "sbc",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw SBC"),
+    .mime_type         = "audio/x-sbc",
+    .extensions        = "sbc,msbc",
+    .audio_codec       = AV_CODEC_ID_SBC,
+    .write_header      = force_one_stream,
+    .write_packet      = ff_raw_write_packet,
+    .flags             = AVFMT_NOTIMESTAMPS,
+};
+#endif
+
 #if CONFIG_TRUEHD_MUXER
 AVOutputFormat ff_truehd_muxer = {
     .name              = "truehd",