[FFmpeg-cvslog] r25556 - in trunk/libavformat: avio.h rtpdec.h rtpproto.c

[aurel]

Author: aurel
Date: Sat Oct 23 18:21:49 2010
New Revision: 25556

Log:
drop rtp_get_file_handles() which is not part of public API and not used anymore

Modified:
   trunk/libavformat/avio.h
   trunk/libavformat/rtpdec.h
   trunk/libavformat/rtpproto.c

Modified: trunk/libavformat/avio.h
==============================================================================
--- trunk/libavformat/avio.h	Sat Oct 23 18:20:56 2010	(r25555)
+++ trunk/libavformat/avio.h	Sat Oct 23 18:21:49 2010	(r25556)
@@ -182,7 +182,6 @@ int64_t url_filesize(URLContext *h);
 /**
  * Return the file descriptor associated with this URL. For RTP, this
  * will return only the RTP file descriptor, not the RTCP file descriptor.
- * To get both, use rtp_get_file_handles().
  *
  * @return the file descriptor associated with this URL, or <0 on error.
  */

Modified: trunk/libavformat/rtpdec.h
==============================================================================
--- trunk/libavformat/rtpdec.h	Sat Oct 23 18:20:56 2010	(r25555)
+++ trunk/libavformat/rtpdec.h	Sat Oct 23 18:21:49 2010	(r25556)
@@ -49,9 +49,6 @@ int rtp_get_local_rtp_port(URLContext *h
 int rtp_get_local_rtcp_port(URLContext *h);
 
 int rtp_set_remote_url(URLContext *h, const char *uri);
-#if (LIBAVFORMAT_VERSION_MAJOR <= 52)
-void rtp_get_file_handles(URLContext *h, int *prtp_fd, int *prtcp_fd);
-#endif
 
 /**
  * Send a dummy packet on both port pairs to set up the connection

Modified: trunk/libavformat/rtpproto.c
==============================================================================
--- trunk/libavformat/rtpproto.c	Sat Oct 23 18:20:56 2010	(r25555)
+++ trunk/libavformat/rtpproto.c	Sat Oct 23 18:21:49 2010	(r25556)
@@ -339,22 +339,6 @@ int rtp_get_local_rtcp_port(URLContext *
     return udp_get_local_port(s->rtcp_hd);
 }
 
-#if (LIBAVFORMAT_VERSION_MAJOR <= 52)
-/**
- * Return the rtp and rtcp file handles for select() usage to wait for
- * several RTP streams at the same time.
- * @param h media file context
- */
-
-void rtp_get_file_handles(URLContext *h, int *prtp_fd, int *prtcp_fd)
-{
-    RTPContext *s = h->priv_data;
-
-    *prtp_fd = s->rtp_fd;
-    *prtcp_fd = s->rtcp_fd;
-}
-#endif
-
 static int rtp_get_file_handle(URLContext *h)
 {
     RTPContext *s = h->priv_data;