Commit 0ffe32cf authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/segment: Use avformat_alloc_output_context2()

This avoids having to assign oformat, allows returning the
correct error code and allocates priv_data

Based on patch by: Mika Raento <mika.raento@elisa.fi>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 3668168a
...@@ -133,12 +133,13 @@ static int segment_mux_init(AVFormatContext *s) ...@@ -133,12 +133,13 @@ static int segment_mux_init(AVFormatContext *s)
SegmentContext *seg = s->priv_data; SegmentContext *seg = s->priv_data;
AVFormatContext *oc; AVFormatContext *oc;
int i; int i;
int ret;
seg->avf = oc = avformat_alloc_context(); ret = avformat_alloc_output_context2(&seg->avf, seg->oformat, NULL, NULL);
if (!oc) if (ret < 0)
return AVERROR(ENOMEM); return ret;
oc = seg->avf;
oc->oformat = seg->oformat;
oc->interrupt_callback = s->interrupt_callback; oc->interrupt_callback = s->interrupt_callback;
av_dict_copy(&oc->metadata, s->metadata, 0); av_dict_copy(&oc->metadata, s->metadata, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment