aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpdec_qdm2.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-24 22:55:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-24 22:55:20 +0100
commit3804d73e46517a7db8464f5affd49b9406dc91ba (patch)
tree5ebac75e43d9b69bfe1bfba880a60caecb642830 /libavformat/rtpdec_qdm2.c
parent48e3cd4fcd49cd7663f56611e20abb5a860caeaa (diff)
parent5d8cae45737bed6239bd6b6e0698802dbe1463c8 (diff)
downloadffmpeg-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_qdm2.c')
-rw-r--r--libavformat/rtpdec_qdm2.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/libavformat/rtpdec_qdm2.c b/libavformat/rtpdec_qdm2.c
index edd9490051..22b419e7e0 100644
--- a/libavformat/rtpdec_qdm2.c
+++ b/libavformat/rtpdec_qdm2.c
@@ -298,21 +298,10 @@ static int qdm2_parse_packet(AVFormatContext *s, PayloadContext *qdm,
return (qdm->cache > 0) ? 1 : 0;
}
-static PayloadContext *qdm2_extradata_new(void)
-{
- return av_mallocz(sizeof(PayloadContext));
-}
-
-static void qdm2_extradata_free(PayloadContext *qdm)
-{
- av_free(qdm);
-}
-
RTPDynamicProtocolHandler ff_qdm2_dynamic_handler = {
.enc_name = "X-QDM",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = AV_CODEC_ID_NONE,
- .alloc = qdm2_extradata_new,
- .free = qdm2_extradata_free,
+ .priv_data_size = sizeof(PayloadContext),
.parse_packet = qdm2_parse_packet,
};