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_mpegts.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_mpegts.c')
| -rw-r--r-- | libavformat/rtpdec_mpegts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpdec_mpegts.c b/libavformat/rtpdec_mpegts.c index 6b9c6768dd..5bf0f186db 100644 --- a/libavformat/rtpdec_mpegts.c +++ b/libavformat/rtpdec_mpegts.c @@ -30,7 +30,7 @@ struct PayloadContext { uint8_t buf[RTP_MAX_PACKET_LENGTH]; }; -static void mpegts_free_context(PayloadContext *data) +static void mpegts_close_context(PayloadContext *data) { if (!data) return; @@ -94,6 +94,6 @@ RTPDynamicProtocolHandler ff_mpegts_dynamic_handler = { .priv_data_size = sizeof(PayloadContext), .parse_packet = mpegts_handle_packet, .init = mpegts_init, - .free = mpegts_free_context, + .close = mpegts_close_context, .static_payload_id = 33, }; |