Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'

[android-x86/external-ffmpeg.git] / libavformat / rtpdec_h264.c

diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c
index 5764711..798c043 100644 (file)
--- a/libavformat/rtpdec_h264.c
+++ b/libavformat/rtpdec_h264.c
@@ -342,11 +342,6 @@ static int h264_handle_packet(AVFormatContext *ctx, PayloadContext *data,
     return result;
 }
 
-static PayloadContext *h264_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void h264_free_context(PayloadContext *data)
 {
 #ifdef DEBUG
@@ -408,8 +403,8 @@ RTPDynamicProtocolHandler ff_h264_dynamic_handler = {
     .codec_type       = AVMEDIA_TYPE_VIDEO,
     .codec_id         = AV_CODEC_ID_H264,
     .need_parsing     = AVSTREAM_PARSE_FULL,
+    .priv_data_size   = sizeof(PayloadContext),
     .parse_sdp_a_line = parse_h264_sdp_line,
-    .alloc            = h264_new_context,
     .free             = h264_free_context,
     .parse_packet     = h264_handle_packet,
 };