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_h264.c | |
parent | 7f03f75ce72fe1c6adfc63f621eeb69cde13769a (diff) | |
parent | d594dbecce5f3af7f80bbf5bb1b516d740b69ccd (diff) |
Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'
* commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd':
rtpdec: Rename the free method to close
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_h264.c')
-rw-r--r-- | libavformat/rtpdec_h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index 64ecde11c0..2ac79dbf5e 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -371,7 +371,7 @@ static int h264_handle_packet(AVFormatContext *ctx, PayloadContext *data, return result; } -static void h264_free_context(PayloadContext *data) +static void h264_close_context(PayloadContext *data) { #ifdef DEBUG int ii; @@ -413,6 +413,6 @@ RTPDynamicProtocolHandler ff_h264_dynamic_handler = { .need_parsing = AVSTREAM_PARSE_FULL, .priv_data_size = sizeof(PayloadContext), .parse_sdp_a_line = parse_h264_sdp_line, - .free = h264_free_context, + .close = h264_close_context, .parse_packet = h264_handle_packet, }; |