From a178edf298d46abd87611fe1938810262c3c8252 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Sat, 23 Oct 2010 16:21:49 +0000
Subject: [PATCH] drop rtp_get_file_handles() which is not part of public API
and not used anymore
Originally committed as revision 25556 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/avio.h | 1 -
libavformat/rtpdec.h | 3 ---
libavformat/rtpproto.c | 16 ----------------
3 files changed, 20 deletions(-)
diff --git a/libavformat/avio.h b/libavformat/avio.h
index e4fd601724..cccf21d6d8 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -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.
*/
diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h
index 0ce98e94dd..41c18c1efd 100644
--- a/libavformat/rtpdec.h
+++ b/libavformat/rtpdec.h
@@ -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
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index b2a9bb641c..70ed84cec3 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -339,22 +339,6 @@ int rtp_get_local_rtcp_port(URLContext *h)
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;