RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-30 03:12:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '78791c086bcaf9eb084c27555b31fea8bbb7624a'

Browse Source 
* commit '78791c086bcaf9eb084c27555b31fea8bbb7624a':
  rtpdec: Use .init instead of .alloc to set default values

Conflicts:
	libavformat/rdt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-25 00:03:52 +01:00
commit d52bf89d21
3 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/rdt.c
View File

@ -298,6 +298,9 @@ rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st,
int seq = 1, res;
AVIOContext pb;
if (!rdt->rmctx)
return AVERROR(EINVAL);
if (rdt->audio_pkt_cnt == 0) {
int pos;
@ -521,24 +524,15 @@ ff_real_parse_sdp_a_line (AVFormatContext *s, int stream_index,
real_parse_asm_rulebook(s, s->streams[stream_index], p);
}
static PayloadContext *
rdt_new_context (void)
static av_cold int rdt_init(AVFormatContext *s, int st_index, PayloadContext *rdt)
{
PayloadContext *rdt = av_mallocz(sizeof(PayloadContext));
if (!rdt)
return NULL;
int ret;
rdt->rmctx = avformat_alloc_context();
if (!rdt->rmctx)
av_freep(&rdt);
return rdt;
}
static int
rdt_init_context (AVFormatContext *s, int st_index, PayloadContext *rdt)
{
int ret;
return AVERROR(ENOMEM);
if ((ret = ff_copy_whitelists(rdt->rmctx, s)) < 0)
return ret;
@ -568,9 +562,9 @@ static RTPDynamicProtocolHandler rdt_ ## n ## _handler = { \
.enc_name = s, \
.codec_type = t, \
.codec_id = AV_CODEC_ID_NONE, \
.priv_data_size = sizeof(PayloadContext), \
.init = rdt_init, \
.parse_sdp_a_line = rdt_parse_sdp_line, \
.alloc = rdt_new_context, \
.init = rdt_init_context, \
.free = rdt_free_context, \
.parse_packet = rdt_parse_packet \
}

13
libavformat/rtpdec_amr.c
View File

@ -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,
};

10
libavformat/rtpdec_vp8.c
View File

@ -269,13 +269,10 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8,
return AVERROR(EAGAIN);
}
static PayloadContext *vp8_new_context(void)
static av_cold int vp8_init(AVFormatContext *s, int st_index, PayloadContext *vp8)
{
PayloadContext *vp8 = av_mallocz(sizeof(PayloadContext));
if (!vp8)
return NULL;
vp8->sequence_ok = 1;
return vp8;
return 0;
}
static void vp8_free_context(PayloadContext *vp8)
@ -293,7 +290,8 @@ RTPDynamicProtocolHandler ff_vp8_dynamic_handler = {
.enc_name = "VP8",
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_VP8,
.alloc = vp8_new_context,
.priv_data_size = sizeof(PayloadContext),
.init = vp8_init,
.free = vp8_free_context,
.parse_packet = vp8_handle_packet,
.need_keyframe = vp8_need_keyframe,