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_asf.c | |
| parent | 48e3cd4fcd49cd7663f56611e20abb5a860caeaa (diff) | |
| parent | 5d8cae45737bed6239bd6b6e0698802dbe1463c8 (diff) | |
| download | ffmpeg-3804d73e46517a7db8464f5affd49b9406dc91ba.tar.gz | |
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_asf.c')
| -rw-r--r-- | libavformat/rtpdec_asf.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index 44c0a243bd..0d6d6e7750 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -288,11 +288,6 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf, return res == 1 ? -1 : res; } -static PayloadContext *asfrtp_new_context(void) -{ - return av_mallocz(sizeof(PayloadContext)); -} - static void asfrtp_free_context(PayloadContext *asf) { if (asf->pktbuf) { @@ -310,8 +305,8 @@ RTPDynamicProtocolHandler ff_ms_rtp_ ## n ## _handler = { \ .enc_name = s, \ .codec_type = t, \ .codec_id = AV_CODEC_ID_NONE, \ + .priv_data_size = sizeof(PayloadContext), \ .parse_sdp_a_line = asfrtp_parse_sdp_line, \ - .alloc = asfrtp_new_context, \ .free = asfrtp_free_context, \ .parse_packet = asfrtp_parse_packet, \ } |