diff options
| author | Martin Storsjö <martin@martin.st> | 2011-04-20 15:36:37 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-04-24 00:05:37 +0300 |
| commit | 9261e6cf3fe579fa02a96761c8e81a77bb3d8b2e (patch) | |
| tree | 35cadce6dbfeee1112fd60a2ed9c53456c4bfff0 /libavformat/rtsp.c | |
| parent | 89b503b55f2b2713f1c3cc8981102c1a7b663281 (diff) | |
rtp: Rename the open/close functions to alloc/free
This avoids clashes if we internally want to override the global
open function.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 58f7ddc1a6..14111e69fd 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -132,8 +132,8 @@ static void init_rtp_handler(RTPDynamicProtocolHandler *handler, return; codec->codec_id = handler->codec_id; rtsp_st->dynamic_handler = handler; - if (handler->open) - rtsp_st->dynamic_protocol_context = handler->open(); + if (handler->alloc) + rtsp_st->dynamic_protocol_context = handler->alloc(); } /* parse the rtpmap description: <codec_name>/<clock_rate>[/<other params>] */ @@ -526,7 +526,7 @@ 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) - rtsp_st->dynamic_handler->close( + rtsp_st->dynamic_handler->free( rtsp_st->dynamic_protocol_context); av_free(rtsp_st); } |