diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 00:58:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 00:58:39 +0100 |
| commit | 3130e5be92858b9a15622965cacc9fe59f5336c2 (patch) | |
| tree | 28d727a541c482d942304d80162b537fcab2580a /libavformat/rtsp.c | |
| parent | 7f03f75ce72fe1c6adfc63f621eeb69cde13769a (diff) | |
| parent | d594dbecce5f3af7f80bbf5bb1b516d740b69ccd (diff) | |
| download | ffmpeg-3130e5be92858b9a15622965cacc9fe59f5336c2.tar.gz | |
Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'
* commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd':
rtpdec: Rename the free method to close
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 529e34b297..05f4171d51 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -206,8 +206,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); } @@ -741,8 +741,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); } |