diff options
| author | Diego Biurrun <diego@biurrun.de> | 2010-10-05 11:06:32 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2010-10-05 11:06:32 +0000 |
| commit | a44da176ac304f023bd1b2e48915d5c2c23fdf9a (patch) | |
| tree | 57cb39f0464e827c36ef61de4ce7789af7c3bb97 /libavformat/rtsp.c | |
| parent | 2e802e385587d431c19bacb792f1887fb3d49a68 (diff) | |
Remove some pointless CONFIG_RTSP_DEMUXER #ifdefs.
They reside within a large CONFIG_RTSP_DEMUXER block and are thus pointless.
Originally committed as revision 25343 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 6ce0ed5bb5..8e977d9817 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1726,7 +1726,6 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, } } } -#if CONFIG_RTSP_DEMUXER if (tcp_fd != -1 && FD_ISSET(tcp_fd, &rfds)) { RTSPMessageHeader reply; @@ -1737,7 +1736,6 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, if (rt->state != RTSP_STATE_STREAMING) return 0; } -#endif } else if (n == 0 && ++timeout_cnt >= MAX_TIMEOUTS) { return FF_NETERROR(ETIMEDOUT); } else if (n < 0 && errno != EINTR) @@ -1850,11 +1848,9 @@ static int rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt) switch(rt->lower_transport) { default: -#if CONFIG_RTSP_DEMUXER case RTSP_LOWER_TRANSPORT_TCP: len = tcp_read_packet(s, &rtsp_st, rt->recvbuf, RECVBUF_SIZE); break; -#endif case RTSP_LOWER_TRANSPORT_UDP: case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: len = udp_read_packet(s, &rtsp_st, rt->recvbuf, RECVBUF_SIZE, wait_end); |