Merge commit '88434f9725e7c9484dcbcf323566ae88a2904f32'

[ffmpeg] / libavformat / rtpdec_asf.c

diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c
index 44c0a243bd06e4f12d52125c29a429f16183380d..0d6d6e77503cdef3874792b187adf9ec5d4ad158 100644 (file)
--- 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,   \
 }