summaryrefslogtreecommitdiff
path: root/libavformat/allformats.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-11-21 08:00:35 +0100
committerClément Bœsch <ubitux@gmail.com>2012-11-21 08:00:35 +0100
commit57d7e21c34112ee7e921038cfae1ab67376ca9cc (patch)
treea6142513ac46a730d7ea38d1f657ca891e5aeca5 /libavformat/allformats.c
parent23db5418ed2ebaddbbc57a45b81caa6e94724587 (diff)
lavf: move libmodplug registration with the other ext lib.
Also remove the duplicated #if.
Diffstat (limited to 'libavformat/allformats.c')
-rw-r--r--libavformat/allformats.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index d08c134d8b..eaeb51ac37 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -269,10 +269,6 @@ void av_register_all(void)
REGISTER_DEMUXER (YOP, yop);
REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe);
- /* external libraries */
-#if CONFIG_LIBMODPLUG
- REGISTER_DEMUXER (LIBMODPLUG, libmodplug);
-#endif
/* protocols */
#if FF_API_APPLEHTTP_PROTO
REGISTER_PROTOCOL (APPLEHTTP, applehttp);
@@ -306,6 +302,7 @@ void av_register_all(void)
REGISTER_PROTOCOL (UDP, udp);
/* external libraries */
+ REGISTER_DEMUXER (LIBMODPLUG, libmodplug);
REGISTER_MUXDEMUX (LIBNUT, libnut);
REGISTER_PROTOCOL (LIBRTMP, librtmp);
REGISTER_PROTOCOL (LIBRTMPE, librtmpe);