RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf: move libmodplug registration with the other ext lib. 

Also remove the duplicated #if.
This commit is contained in:
Clément Bœsch 2012-11-21 08:00:35 +01:00
parent 23db5418ed
commit 57d7e21c34
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/allformats.c
View File

@ -269,10 +269,6 @@ void av_register_all(void)
REGISTER_DEMUXER (YOP, yop); REGISTER_DEMUXER (YOP, yop);
REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe); REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe);
/* external libraries */
#if CONFIG_LIBMODPLUG
REGISTER_DEMUXER (LIBMODPLUG, libmodplug);
#endif
/* protocols */ /* protocols */
#if FF_API_APPLEHTTP_PROTO #if FF_API_APPLEHTTP_PROTO
REGISTER_PROTOCOL (APPLEHTTP, applehttp); REGISTER_PROTOCOL (APPLEHTTP, applehttp);
@ -306,6 +302,7 @@ void av_register_all(void)
REGISTER_PROTOCOL (UDP, udp); REGISTER_PROTOCOL (UDP, udp);
/* external libraries */ /* external libraries */
REGISTER_DEMUXER (LIBMODPLUG, libmodplug);
REGISTER_MUXDEMUX (LIBNUT, libnut); REGISTER_MUXDEMUX (LIBNUT, libnut);
REGISTER_PROTOCOL (LIBRTMP, librtmp); REGISTER_PROTOCOL (LIBRTMP, librtmp);
REGISTER_PROTOCOL (LIBRTMPE, librtmpe); REGISTER_PROTOCOL (LIBRTMPE, librtmpe);