RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

segment: Properly create new AVStreams for the chained muxer 

Before, the chained muxer reused the AVStreams array from
the outer muxer, which made it impossible to use the proper
public functions (such as av_write_frame) when calling the
chained muxer.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2012-02-26 01:39:32 +02:00
parent aa9f128b7c
commit 0edae4e628
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/segment.c
View File

@ -147,8 +147,15 @@ static int seg_write_header(AVFormatContext *s)
oc->interrupt_callback = s->interrupt_callback; oc->interrupt_callback = s->interrupt_callback;
seg->avf = oc; seg->avf = oc;
oc->streams = s->streams; for (i = 0; i < s->nb_streams; i++) {
oc->nb_streams = s->nb_streams; AVStream *st;
if (!(st = avformat_new_stream(oc, NULL))) {
ret = AVERROR(ENOMEM);
goto fail;
}
avcodec_copy_context(st->codec, s->streams[i]->codec);
st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
}
if (av_get_frame_filename(oc->filename, sizeof(oc->filename), if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
s->filename, seg->number++) < 0) { s->filename, seg->number++) < 0) {
@ -172,8 +179,6 @@ static int seg_write_header(AVFormatContext *s)
fail: fail:
if (ret) { if (ret) {
oc->streams = NULL;
oc->nb_streams = 0;
if (seg->list) if (seg->list)
avio_close(seg->pb); avio_close(seg->pb);
avformat_free_context(oc); avformat_free_context(oc);
@ -185,7 +190,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
SegmentContext *seg = s->priv_data; SegmentContext *seg = s->priv_data;
AVFormatContext *oc = seg->avf; AVFormatContext *oc = seg->avf;
AVStream *st = oc->streams[pkt->stream_index]; AVStream *st = s->streams[pkt->stream_index];
int64_t end_pts = seg->recording_time * seg->number; int64_t end_pts = seg->recording_time * seg->number;
int ret; int ret;
@ -217,12 +222,10 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
} }
} }
ret = oc->oformat->write_packet(oc, pkt); ret = ff_write_chained(oc, pkt->stream_index, pkt, s);
fail: fail:
if (ret < 0) { if (ret < 0) {
oc->streams = NULL;
oc->nb_streams = 0;
if (seg->list) if (seg->list)
avio_close(seg->pb); avio_close(seg->pb);
avformat_free_context(oc); avformat_free_context(oc);
@ -238,8 +241,6 @@ static int seg_write_trailer(struct AVFormatContext *s)
int ret = segment_end(oc); int ret = segment_end(oc);
if (seg->list) if (seg->list)
avio_close(seg->pb); avio_close(seg->pb);
oc->streams = NULL;
oc->nb_streams = 0;
avformat_free_context(oc); avformat_free_context(oc);
return ret; return ret;
} }