summaryrefslogtreecommitdiff
path: root/libavformat/rtpdec_mpegts.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-24 22:55:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-24 22:55:20 +0100
commit3804d73e46517a7db8464f5affd49b9406dc91ba (patch)
tree5ebac75e43d9b69bfe1bfba880a60caecb642830 /libavformat/rtpdec_mpegts.c
parent48e3cd4fcd49cd7663f56611e20abb5a860caeaa (diff)
parent5d8cae45737bed6239bd6b6e0698802dbe1463c8 (diff)
Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'
* commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8': rtpdec: Get rid of all trivial .alloc/.free functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_mpegts.c')
-rw-r--r--libavformat/rtpdec_mpegts.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/rtpdec_mpegts.c b/libavformat/rtpdec_mpegts.c
index 0c2b71745e..ae17f4ec0f 100644
--- a/libavformat/rtpdec_mpegts.c
+++ b/libavformat/rtpdec_mpegts.c
@@ -30,11 +30,6 @@ struct PayloadContext {
uint8_t buf[RTP_MAX_PACKET_LENGTH];
};
-static PayloadContext *mpegts_new_context(void)
-{
- return av_mallocz(sizeof(PayloadContext));
-}
-
static void mpegts_free_context(PayloadContext *data)
{
if (!data)
@@ -100,8 +95,8 @@ static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data,
RTPDynamicProtocolHandler ff_mpegts_dynamic_handler = {
.codec_type = AVMEDIA_TYPE_DATA,
+ .priv_data_size = sizeof(PayloadContext),
.parse_packet = mpegts_handle_packet,
- .alloc = mpegts_new_context,
.init = mpegts_init,
.free = mpegts_free_context,
.static_payload_id = 33,