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_mpeg4.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_mpeg4.c')
| -rw-r--r-- | libavformat/rtpdec_mpeg4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index 23b5dc8b0e..70e51f862c 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -91,7 +91,7 @@ static const AttrNameMap attr_names[] = { { NULL, -1, -1 }, }; -static void free_context(PayloadContext *data) +static void close_context(PayloadContext *data) { av_freep(&data->au_headers); av_freep(&data->mode); @@ -329,6 +329,6 @@ RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = { .codec_id = AV_CODEC_ID_AAC, .priv_data_size = sizeof(PayloadContext), .parse_sdp_a_line = parse_sdp_line, - .free = free_context, + .close = close_context, .parse_packet = aac_parse_packet, }; |