diff --git a/Changelog b/Changelog
index a45bb9eccc..675288effc 100644
--- a/Changelog
+++ b/Changelog
@@ -49,7 +49,7 @@ version <next>:
 - innoHeim/Rsupport Screen Capture Codec decoder
 - support encoding 16-bit RLE SGI images
 - support Apple AVFoundation video capture
-- G.723.1 encoder
+- G.723.1 muxer and encoder
 
 
 version 11:
diff --git a/libavformat/Makefile b/libavformat/Makefile
index ea955e28f6..c5d1bfa202 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -138,6 +138,7 @@ OBJS-$(CONFIG_GXF_MUXER)                 += gxfenc.o audiointerleave.o
 OBJS-$(CONFIG_G722_DEMUXER)              += g722.o rawdec.o
 OBJS-$(CONFIG_G722_MUXER)                += rawenc.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_MUXER)                += rawenc.o
 OBJS-$(CONFIG_H263_DEMUXER)              += h263dec.o rawdec.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 1f76b1b1ef..a514c630fb 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -111,7 +111,7 @@ void av_register_all(void)
     REGISTER_MUXER   (FRAMECRC,         framecrc);
     REGISTER_MUXER   (FRAMEMD5,         framemd5);
     REGISTER_MUXDEMUX(G722,             g722);
-    REGISTER_DEMUXER (G723_1,           g723_1);
+    REGISTER_MUXDEMUX(G723_1,           g723_1);
     REGISTER_MUXER   (GIF,              gif);
     REGISTER_DEMUXER (GSM,              gsm);
     REGISTER_MUXDEMUX(GXF,              gxf);
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 5d6164656d..e4c79bf3ee 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -131,6 +131,19 @@ AVOutputFormat ff_g722_muxer = {
 };
 #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
 AVOutputFormat ff_h261_muxer = {
     .name              = "h261",
diff --git a/libavformat/version.h b/libavformat/version.h
index ce367dc6ca..e29e4eb4f4 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR 57
-#define LIBAVFORMAT_VERSION_MINOR  1
+#define LIBAVFORMAT_VERSION_MINOR  2
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \