merge some REGISTER_MUXER/DEMUXER into REGISTER_MUXDEMUX

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10048 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index de4a5cf70b0c1ee909860682cb50b0356a1fa128..a71f1bf3d53a755f60f81bd574f47e58b41bf98f 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -79,8 +79,7 @@ void av_register_all(void)
     REGISTER_DEMUXER (FOURXM, fourxm);
     REGISTER_MUXER   (FRAMECRC, framecrc);
     REGISTER_MUXDEMUX(GIF, gif);
-    REGISTER_DEMUXER (GXF, gxf);
-    REGISTER_MUXER   (GXF, gxf);
+    REGISTER_MUXDEMUX(GXF, gxf);
     REGISTER_MUXDEMUX(H261, h261);
     REGISTER_MUXDEMUX(H263, h263);
     REGISTER_MUXDEMUX(H264, h264);
@@ -119,8 +118,7 @@ void av_register_all(void)
     REGISTER_MUXER   (NULL, null);
     REGISTER_MUXDEMUX(NUT, nut);
     REGISTER_DEMUXER (NUV, nuv);
-    REGISTER_DEMUXER (OGG, ogg);
-    REGISTER_MUXER   (OGG, ogg);
+    REGISTER_MUXDEMUX(OGG, ogg);
     REGISTER_MUXDEMUX(PCM_ALAW,  pcm_alaw);
     REGISTER_MUXDEMUX(PCM_MULAW, pcm_mulaw);
     REGISTER_MUXDEMUX(PCM_S16BE, pcm_s16be);