aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpdec_qcelp.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_qcelp.c
parente72605f80bf5cbe32053a554ccc137e0a99cf3dd (diff)
downloadffmpeg-5d8cae45737bed6239bd6b6e0698802dbe1463c8.tar.gz
rtpdec: Get rid of all trivial .alloc/.free functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtpdec_qcelp.c')
-rw-r--r--libavformat/rtpdec_qcelp.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/libavformat/rtpdec_qcelp.c b/libavformat/rtpdec_qcelp.c
index b612c7d47e..d5322d6a71 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,
};