diff --git a/libavformat/Makefile b/libavformat/Makefile
index e67f97b6ce..a7598d9a9b 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -144,7 +144,7 @@ OBJS-$(CONFIG_MXF_DEMUXER)               += mxfdec.o mxf.o
 OBJS-$(CONFIG_MXF_MUXER)                 += mxfenc.o mxf.o audiointerleave.o
 OBJS-$(CONFIG_NC_DEMUXER)                += ncdec.o
 OBJS-$(CONFIG_NSV_DEMUXER)               += nsvdec.o
-OBJS-$(CONFIG_NULL_MUXER)                += raw.o
+OBJS-$(CONFIG_NULL_MUXER)                += nullenc.o
 OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o nut.o riff.o
 OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o nut.o riff.o
 OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.o riff.o
diff --git a/libavformat/nullenc.c b/libavformat/nullenc.c
new file mode 100644
index 0000000000..0785b77dbd
--- /dev/null
+++ b/libavformat/nullenc.c
@@ -0,0 +1,40 @@
+/*
+ * RAW null muxer
+ * Copyright (c) 2002 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avformat.h"
+
+static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
+{
+    return 0;
+}
+
+AVOutputFormat null_muxer = {
+    "null",
+    NULL_IF_CONFIG_SMALL("raw null video format"),
+    NULL,
+    NULL,
+    0,
+    AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE),
+    CODEC_ID_RAWVIDEO,
+    NULL,
+    null_write_packet,
+    .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
+};
diff --git a/libavformat/raw.c b/libavformat/raw.c
index b8351bf007..2a8d299bf9 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -25,13 +25,6 @@
 
 /* simple formats */
 
-#if CONFIG_NULL_MUXER
-static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
-{
-    return 0;
-}
-#endif
-
 #if CONFIG_MUXERS
 int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
@@ -530,21 +523,6 @@ AVOutputFormat mpeg2video_muxer = {
 };
 #endif
 
-#if CONFIG_NULL_MUXER
-AVOutputFormat null_muxer = {
-    "null",
-    NULL_IF_CONFIG_SMALL("raw null video format"),
-    NULL,
-    NULL,
-    0,
-    AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE),
-    CODEC_ID_RAWVIDEO,
-    NULL,
-    null_write_packet,
-    .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
-};
-#endif
-
 #if CONFIG_RAWVIDEO_DEMUXER
 AVInputFormat rawvideo_demuxer = {
     "rawvideo",