diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:55:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:55:20 +0100 |
| commit | 3804d73e46517a7db8464f5affd49b9406dc91ba (patch) | |
| tree | 5ebac75e43d9b69bfe1bfba880a60caecb642830 /libavformat/rtpdec_xiph.c | |
| parent | 48e3cd4fcd49cd7663f56611e20abb5a860caeaa (diff) | |
| parent | 5d8cae45737bed6239bd6b6e0698802dbe1463c8 (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_xiph.c')
| -rw-r--r-- | libavformat/rtpdec_xiph.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index 7b9ea9e442..6ed8667726 100644 --- a/libavformat/rtpdec_xiph.c +++ b/libavformat/rtpdec_xiph.c @@ -49,11 +49,6 @@ struct PayloadContext { int split_pkts; }; -static PayloadContext *xiph_new_context(void) -{ - return av_mallocz(sizeof(PayloadContext)); -} - static inline void free_fragment(PayloadContext * data) { if (data->fragment) { @@ -385,8 +380,8 @@ RTPDynamicProtocolHandler ff_theora_dynamic_handler = { .enc_name = "theora", .codec_type = AVMEDIA_TYPE_VIDEO, .codec_id = AV_CODEC_ID_THEORA, + .priv_data_size = sizeof(PayloadContext), .parse_sdp_a_line = xiph_parse_sdp_line, - .alloc = xiph_new_context, .free = xiph_free_context, .parse_packet = xiph_handle_packet, }; @@ -396,8 +391,8 @@ RTPDynamicProtocolHandler ff_vorbis_dynamic_handler = { .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_VORBIS, .need_parsing = AVSTREAM_PARSE_HEADERS, + .priv_data_size = sizeof(PayloadContext), .parse_sdp_a_line = xiph_parse_sdp_line, - .alloc = xiph_new_context, .free = xiph_free_context, .parse_packet = xiph_handle_packet, }; |