From 78791c086bcaf9eb084c27555b31fea8bbb7624a Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Tue, 24 Feb 2015 12:43:07 +0200 Subject: rtpdec: Use .init instead of .alloc to set default values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ugly error handling in rdt gets improved in a later commit. Signed-off-by: Martin Storsjö --- libavformat/rtpdec_amr.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'libavformat/rtpdec_amr.c') diff --git a/libavformat/rtpdec_amr.c b/libavformat/rtpdec_amr.c index 8216a5b911..b6a8c29052 100644 --- a/libavformat/rtpdec_amr.c +++ b/libavformat/rtpdec_amr.c @@ -38,13 +38,10 @@ struct PayloadContext { int channels; }; -static PayloadContext *amr_new_context(void) +static av_cold int amr_init(AVFormatContext *s, int st_index, PayloadContext *data) { - PayloadContext *data = av_mallocz(sizeof(PayloadContext)); - if (!data) - return data; data->channels = 1; - return data; + return 0; } static int amr_handle_packet(AVFormatContext *ctx, PayloadContext *data, @@ -189,8 +186,9 @@ RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler = { .enc_name = "AMR", .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_AMR_NB, + .priv_data_size = sizeof(PayloadContext), + .init = amr_init, .parse_sdp_a_line = amr_parse_sdp_line, - .alloc = amr_new_context, .parse_packet = amr_handle_packet, }; @@ -198,7 +196,8 @@ RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler = { .enc_name = "AMR-WB", .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_AMR_WB, + .priv_data_size = sizeof(PayloadContext), + .init = amr_init, .parse_sdp_a_line = amr_parse_sdp_line, - .alloc = amr_new_context, .parse_packet = amr_handle_packet, }; -- cgit v1.2.3