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_qcelp.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_qcelp.c')
-rw-r--r-- | libavformat/rtpdec_qcelp.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libavformat/rtpdec_qcelp.c b/libavformat/rtpdec_qcelp.c index 7f5769f194..41cc8263df 100644 --- a/libavformat/rtpdec_qcelp.c +++ b/libavformat/rtpdec_qcelp.c @@ -47,16 +47,6 @@ struct PayloadContext { uint32_t next_timestamp; }; -static PayloadContext *qcelp_new_context(void) -{ - return av_mallocz(sizeof(PayloadContext)); -} - -static void qcelp_free_context(PayloadContext *data) -{ - av_free(data); -} - static int return_stored_frame(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, const uint8_t *buf, int len); @@ -223,8 +213,7 @@ RTPDynamicProtocolHandler ff_qcelp_dynamic_handler = { .enc_name = "x-Purevoice", .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_QCELP, + .priv_data_size = sizeof(PayloadContext), .static_payload_id = 12, - .alloc = qcelp_new_context, - .free = qcelp_free_context, .parse_packet = qcelp_parse_packet, }; |