summaryrefslogtreecommitdiff
path: root/libavformat/rtsp.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-02-24 17:01:48 +0200
committerMartin Storsjö <martin@martin.st>2015-02-24 23:07:50 +0200
commitd594dbecce5f3af7f80bbf5bb1b516d740b69ccd (patch)
tree8e30acd43b8d945d23f224ba5d165c59a1155380 /libavformat/rtsp.c
parent8e32b1f0963d01d4f5d4803eb721f162e0d58d9a (diff)
rtpdec: Rename the free method to close
Many of these functions were named foo_free_context, and since the functions no longer should free the context itself, only allocated elements within it, the previous naming was slightly misleading. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtsp.c')
-rw-r--r--libavformat/rtsp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index f7b7b32851..55a7896d27 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -201,8 +201,8 @@ static void finalize_rtp_handler_init(AVFormatContext *s, RTSPStream *rtsp_st,
rtsp_st->dynamic_protocol_context);
if (ret < 0) {
if (rtsp_st->dynamic_protocol_context) {
- if (rtsp_st->dynamic_handler->free)
- rtsp_st->dynamic_handler->free(
+ if (rtsp_st->dynamic_handler->close)
+ rtsp_st->dynamic_handler->close(
rtsp_st->dynamic_protocol_context);
av_free(rtsp_st->dynamic_protocol_context);
}
@@ -734,8 +734,8 @@ void ff_rtsp_close_streams(AVFormatContext *s)
rtsp_st = rt->rtsp_streams[i];
if (rtsp_st) {
if (rtsp_st->dynamic_handler && rtsp_st->dynamic_protocol_context) {
- if (rtsp_st->dynamic_handler->free)
- rtsp_st->dynamic_handler->free(
+ if (rtsp_st->dynamic_handler->close)
+ rtsp_st->dynamic_handler->close(
rtsp_st->dynamic_protocol_context);
av_free(rtsp_st->dynamic_protocol_context);
}