avfiltergraph: replace AVFilterGraph.filter_count with nb_filters

[ffmpeg] / libavformat / allformats.c

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 9a5e2b74efaf7f92a6fc43953258f2045a265f5f..6dbf9fda04d7530dcdae527051ca79e80a917803 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -39,9 +39,7 @@
             av_register_input_format(&ff_##x##_demuxer);                \
     }
 
-#define REGISTER_MUXDEMUX(X, x)                                         \
-    REGISTER_MUXER(X, x);                                               \
-    REGISTER_DEMUXER(X,x)
+#define REGISTER_MUXDEMUX(X, x) REGISTER_MUXER(X, x); REGISTER_DEMUXER(X, x)
 
 #define REGISTER_PROTOCOL(X, x)                                         \
     {                                                                   \
@@ -257,9 +255,6 @@ void av_register_all(void)
     REGISTER_MUXDEMUX(YUV4MPEGPIPE,     yuv4mpegpipe);
 
     /* protocols */
-#if FF_API_APPLEHTTP_PROTO
-    REGISTER_PROTOCOL(APPLEHTTP,        applehttp);
-#endif
     REGISTER_PROTOCOL(CONCAT,           concat);
     REGISTER_PROTOCOL(CRYPTO,           crypto);
     REGISTER_PROTOCOL(FFRTMPCRYPT,      ffrtmpcrypt);
@@ -282,6 +277,7 @@ void av_register_all(void)
     REGISTER_PROTOCOL(RTMPTS,           rtmpts);
     REGISTER_PROTOCOL(RTP,              rtp);
     REGISTER_PROTOCOL(SCTP,             sctp);
+    REGISTER_PROTOCOL(SRTP,             srtp);
     REGISTER_PROTOCOL(TCP,              tcp);
     REGISTER_PROTOCOL(TLS,              tls);
     REGISTER_PROTOCOL(UDP,              udp);