eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 10:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

avio: make url_close() internal.

Browse Source
This commit is contained in:
Anton Khirnov
2011-03-31 17:36:06 +02:00
parent 58a48c6511
commit e52a9145c8
16 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/rtsp.c
View File

@@ -509,7 +509,7 @@ void ff_rtsp_undo_setup(AVFormatContext *s)
}
rtsp_st->transport_priv = NULL;
if (rtsp_st->rtp_handle)
url_close(rtsp_st->rtp_handle);
ffurl_close(rtsp_st->rtp_handle);
rtsp_st->rtp_handle = NULL;
}
}
@@ -1297,8 +1297,8 @@ fail:
void ff_rtsp_close_connections(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
if (rt->rtsp_hd_out != rt->rtsp_hd) url_close(rt->rtsp_hd_out);
url_close(rt->rtsp_hd);
if (rt->rtsp_hd_out != rt->rtsp_hd) ffurl_close(rt->rtsp_hd_out);
ffurl_close(rt->rtsp_hd);
rt->rtsp_hd = rt->rtsp_hd_out = NULL;
}
@@ -1888,7 +1888,7 @@ static int rtp_read_header(AVFormatContext *s,
break;
}
getsockname(url_get_file_handle(in), (struct sockaddr*) &addr, &addrlen);
url_close(in);
ffurl_close(in);
in = NULL;
memset(&codec, 0, sizeof(codec));
@@ -1927,7 +1927,7 @@ static int rtp_read_header(AVFormatContext *s,
fail:
if (in)
url_close(in);
ffurl_close(in);
ff_network_close();
return ret;
}