Merge commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8'

[ffmpeg] / libavformat / allformats.c

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index c3b9ba53ee14445330ecae565f8cb1fd16e7a32b..8f70c4b12a3b502d0a33e5ba02962827687c6196 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -274,8 +274,8 @@ void av_register_all(void)
     REGISTER_DEMUXER (SMUSH,            smush);
     REGISTER_DEMUXER (SOL,              sol);
     REGISTER_MUXDEMUX(SOX,              sox);
+    REGISTER_MUXER   (SPX,              spx);
     REGISTER_MUXDEMUX(SPDIF,            spdif);
-    REGISTER_MUXER   (SPEEX,            speex);
     REGISTER_MUXDEMUX(SRT,              srt);
     REGISTER_DEMUXER (STR,              str);
     REGISTER_DEMUXER (SUBVIEWER1,       subviewer1);