*_protocol are not part of public API

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

diff --git a/libavformat/allformats.h b/libavformat/allformats.h
index 1a8509b011b5769e3a22e95162c9a1e9bdfffcda..3cbea4e11bb1c3dec96a6e235d9448e7811382ea 100644 (file)
--- a/libavformat/allformats.h
+++ b/libavformat/allformats.h
@@ -185,6 +185,13 @@ extern AVOutputFormat voc_muxer;
 extern AVOutputFormat wav_muxer;
 extern AVOutputFormat yuv4mpegpipe_muxer;
 
+extern URLProtocol file_protocol;
+extern URLProtocol http_protocol;
+extern URLProtocol pipe_protocol;
+extern URLProtocol rtp_protocol;
+extern URLProtocol tcp_protocol;
+extern URLProtocol udp_protocol;
+
 /* raw.c */
 int pcm_read_seek(AVFormatContext *s,
                   int stream_index, int64_t timestamp, int flags);

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 8db657f2824d23bb230d527e7c0c0f5d7d23fff5..0d43a7bc8e5e1e609793afe442875cd9e98a95d6 100644 (file)
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -254,21 +254,10 @@ int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer);
 unsigned long get_checksum(ByteIOContext *s);
 void init_checksum(ByteIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), unsigned long checksum);
 
-/* file.c */
-extern URLProtocol file_protocol;
-extern URLProtocol pipe_protocol;
-
 /* udp.c */
-extern URLProtocol udp_protocol;
 int udp_set_remote_url(URLContext *h, const char *uri);
 int udp_get_local_port(URLContext *h);
 int udp_get_file_handle(URLContext *h);
 
-/* tcp.c  */
-extern URLProtocol tcp_protocol;
-
-/* http.c */
-extern URLProtocol http_protocol;
-
 #endif
 

diff --git a/libavformat/rtp.h b/libavformat/rtp.h
index dc91de5a560fd7ff95ff2656cc1f1c6984fe5044..685af99aff0ae72cecd42a76f84559d225ea5ef2 100644 (file)
--- a/libavformat/rtp.h
+++ b/libavformat/rtp.h
@@ -54,8 +54,6 @@ void rtp_get_file_handles(URLContext *h, int *prtp_fd, int *prtcp_fd);
  */
 int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count);
 
-extern URLProtocol rtp_protocol;
-
 #define RTP_PT_PRIVATE 96
 #define RTP_VERSION 2
 #define RTP_MAX_SDES 256   /**< maximum text length for SDES */