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_jpeg.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_jpeg.c')
| -rw-r--r-- | libavformat/rtpdec_jpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c index ca4debef99..2028053536 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -60,7 +60,7 @@ static const uint8_t default_quantizers[128] = { 99, 99, 99, 99, 99, 99, 99, 99 }; -static void jpeg_free_context(PayloadContext *jpeg) +static void jpeg_close_context(PayloadContext *jpeg) { ffio_free_dyn_buf(&jpeg->frame); } @@ -388,7 +388,7 @@ RTPDynamicProtocolHandler ff_jpeg_dynamic_handler = { .codec_type = AVMEDIA_TYPE_VIDEO, .codec_id = AV_CODEC_ID_MJPEG, .priv_data_size = sizeof(PayloadContext), - .free = jpeg_free_context, + .close = jpeg_close_context, .parse_packet = jpeg_parse_packet, .static_payload_id = 26, }; |