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/rtpdec_asf.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/rtpdec_asf.c')
| -rw-r--r-- | libavformat/rtpdec_asf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index 5b5a8da58b..019123e559 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -285,7 +285,7 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf, return res == 1 ? -1 : res; } -static void asfrtp_free_context(PayloadContext *asf) +static void asfrtp_close_context(PayloadContext *asf) { ffio_free_dyn_buf(&asf->pktbuf); av_freep(&asf->buf); @@ -299,7 +299,7 @@ RTPDynamicProtocolHandler ff_ms_rtp_ ## n ## _handler = { \ .codec_id = AV_CODEC_ID_NONE, \ .priv_data_size = sizeof(PayloadContext), \ .parse_sdp_a_line = asfrtp_parse_sdp_line, \ - .free = asfrtp_free_context, \ + .close = asfrtp_close_context, \ .parse_packet = asfrtp_parse_packet, \ } |