| Message ID | 20200328181515.5333-2-cus@passwd.hu |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,1/8] fftools/ffmpeg: also flush encoders which have a variable frame size | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
Marton Balint: > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > libavformat/mux.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/mux.c b/libavformat/mux.c > index bfd1bf491b..dfb21c8aa5 100644 > --- a/libavformat/mux.c > +++ b/libavformat/mux.c > @@ -798,7 +798,7 @@ static int prepare_input_packet(AVFormatContext *s, AVPacket *pkt) > > #if !FF_API_COMPUTE_PKT_FIELDS2 || !FF_API_LAVF_AVCTX > /* sanitize the timestamps */ > - if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) { > + if (pkt && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) { > AVStream *st = s->streams[pkt->stream_index]; > > /* when there is no reordering (so dts is equal to pts), but > Overlaps with [1]. - Andreas [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2019-August/248144.html
On Sat, 28 Mar 2020, Andreas Rheinhardt wrote: > Marton Balint: >> Signed-off-by: Marton Balint <cus@passwd.hu> >> --- >> libavformat/mux.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavformat/mux.c b/libavformat/mux.c >> index bfd1bf491b..dfb21c8aa5 100644 >> --- a/libavformat/mux.c >> +++ b/libavformat/mux.c >> @@ -798,7 +798,7 @@ static int prepare_input_packet(AVFormatContext *s, AVPacket *pkt) >> >> #if !FF_API_COMPUTE_PKT_FIELDS2 || !FF_API_LAVF_AVCTX >> /* sanitize the timestamps */ >> - if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) { >> + if (pkt && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) { >> AVStream *st = s->streams[pkt->stream_index]; >> >> /* when there is no reordering (so dts is equal to pts), but >> > Overlaps with [1]. Can you resend still valid patches from that series? I might have more knowledge now to review... Thanks, Marton
diff --git a/libavformat/mux.c b/libavformat/mux.c index bfd1bf491b..dfb21c8aa5 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -798,7 +798,7 @@ static int prepare_input_packet(AVFormatContext *s, AVPacket *pkt) #if !FF_API_COMPUTE_PKT_FIELDS2 || !FF_API_LAVF_AVCTX /* sanitize the timestamps */ - if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) { + if (pkt && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) { AVStream *st = s->streams[pkt->stream_index]; /* when there is no reordering (so dts is equal to pts), but
Signed-off-by: Marton Balint <cus@passwd.hu> --- libavformat/mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)