[FFmpeg-cvslog] lavf: move libmodplug registration with the other ext lib.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Wed Nov 21 08:00:35 2012 +0100| [57d7e21c34112ee7e921038cfae1ab67376ca9cc] | committer: Clément Bœsch

lavf: move libmodplug registration with the other ext lib.

Also remove the duplicated #if.

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

 libavformat/allformats.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index d08c134..eaeb51a 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);