summaryrefslogtreecommitdiff
path: root/libavformat/rtpdec_mpeg4.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-02-23 22:18:32 +0200
committerMartin Storsjö <martin@martin.st>2015-02-24 16:24:19 +0200
commit5d8cae45737bed6239bd6b6e0698802dbe1463c8 (patch)
treed7f5c2316c6d71136cde6d31da2bd2f491362560 /libavformat/rtpdec_mpeg4.c
parente72605f80bf5cbe32053a554ccc137e0a99cf3dd (diff)
rtpdec: Get rid of all trivial .alloc/.free functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtpdec_mpeg4.c')
-rw-r--r--libavformat/rtpdec_mpeg4.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c
index c449ea63e0..4a0593b540 100644
--- a/libavformat/rtpdec_mpeg4.c
+++ b/libavformat/rtpdec_mpeg4.c
@@ -91,11 +91,6 @@ static const AttrNameMap attr_names[] = {
{ NULL, -1, -1 },
};
-static PayloadContext *new_context(void)
-{
- return av_mallocz(sizeof(PayloadContext));
-}
-
static void free_context(PayloadContext *data)
{
av_free(data->au_headers);
@@ -326,6 +321,7 @@ RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = {
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_MPEG4,
.need_parsing = AVSTREAM_PARSE_FULL,
+ .priv_data_size = sizeof(PayloadContext),
.parse_sdp_a_line = parse_sdp_line,
};
@@ -333,8 +329,8 @@ RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = {
.enc_name = "mpeg4-generic",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = AV_CODEC_ID_AAC,
+ .priv_data_size = sizeof(PayloadContext),
.parse_sdp_a_line = parse_sdp_line,
- .alloc = new_context,
.free = free_context,
.parse_packet = aac_parse_packet,
};