| Message ID | 20200331230553.5159-1-cus@passwd.hu |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel] avformat/segment: always use interleaved writes for formats with custom interleaving | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
On Wed, 1 Apr 2020, Marton Balint wrote: > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > libavformat/segment.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/libavformat/segment.c b/libavformat/segment.c > index 2a838c7da7..60b72b7d15 100644 > --- a/libavformat/segment.c > +++ b/libavformat/segment.c > @@ -971,7 +971,8 @@ calc_times: > av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), > av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base)); > > - ret = ff_write_chained(seg->avf, pkt->stream_index, pkt, s, seg->initial_offset || seg->reset_timestamps); > + ret = ff_write_chained(seg->avf, pkt->stream_index, pkt, s, > + seg->initial_offset || seg->reset_timestamps || seg->avf->oformat->interleave_packet); Ping, will apply soon. Thanks, Marton
On Tue, 7 Apr 2020, Marton Balint wrote: > > > On Wed, 1 Apr 2020, Marton Balint wrote: > >> Signed-off-by: Marton Balint <cus@passwd.hu> >> --- >> libavformat/segment.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/libavformat/segment.c b/libavformat/segment.c >> index 2a838c7da7..60b72b7d15 100644 >> --- a/libavformat/segment.c >> +++ b/libavformat/segment.c >> @@ -971,7 +971,8 @@ calc_times: >> av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), >> av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base)); >> >> - ret = ff_write_chained(seg->avf, pkt->stream_index, pkt, s, > seg->initial_offset || seg->reset_timestamps); >> + ret = ff_write_chained(seg->avf, pkt->stream_index, pkt, s, >> + seg->initial_offset || seg->reset_timestamps || > seg->avf->oformat->interleave_packet); > > Ping, will apply soon. Applied. Regards, Marton
diff --git a/libavformat/segment.c b/libavformat/segment.c index 2a838c7da7..60b72b7d15 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -971,7 +971,8 @@ calc_times: av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base)); - ret = ff_write_chained(seg->avf, pkt->stream_index, pkt, s, seg->initial_offset || seg->reset_timestamps); + ret = ff_write_chained(seg->avf, pkt->stream_index, pkt, s, + seg->initial_offset || seg->reset_timestamps || seg->avf->oformat->interleave_packet); fail: if (pkt->stream_index == seg->reference_stream_index) {
Signed-off-by: Marton Balint <cus@passwd.hu> --- libavformat/segment.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)