| Message ID | 20230829205749.60630-1-leo.izen@gmail.com |
|---|---|
| State | Accepted |
| Commit | 60be62d29388fdc681540dff387e0304e610bf39 |
| Headers | show |
| Series | [FFmpeg-devel] fftools/ffmpeg_mux: replace monotonous with monotonic | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Tue, 29 Aug 2023 at 21:58, Leo Izen <leo.izen@gmail.com> wrote: > The word "monotonous" means "spoken in a monotone" which is not what we > mean here. We mean "monotonic" i.e. nondecreasing. > > Signed-off-by: Leo Izen <leo.izen@gmail.com> > --- > fftools/ffmpeg_mux.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c > index 24cdf00469..933f1e51a4 100644 > --- a/fftools/ffmpeg_mux.c > +++ b/fftools/ffmpeg_mux.c > @@ -99,7 +99,7 @@ static int write_packet(Muxer *mux, OutputStream *ost, > AVPacket *pkt) > int loglevel = max - pkt->dts > 2 || ost->type == > AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG; > if (exit_on_error) > loglevel = AV_LOG_ERROR; > - av_log(s, loglevel, "Non-monotonous DTS in output stream " > + av_log(s, loglevel, "Non-monotonic DTS in output stream " > "%d:%d; previous: %"PRId64", current: %"PRId64"; ", > ost->file_index, ost->st->index, ms->last_mux_dts, > pkt->dts); > if (exit_on_error) { > -- > 2.42.0 > LGTM. Kieran
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 24cdf00469..933f1e51a4 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -99,7 +99,7 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) int loglevel = max - pkt->dts > 2 || ost->type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG; if (exit_on_error) loglevel = AV_LOG_ERROR; - av_log(s, loglevel, "Non-monotonous DTS in output stream " + av_log(s, loglevel, "Non-monotonic DTS in output stream " "%d:%d; previous: %"PRId64", current: %"PRId64"; ", ost->file_index, ost->st->index, ms->last_mux_dts, pkt->dts); if (exit_on_error) {
The word "monotonous" means "spoken in a monotone" which is not what we mean here. We mean "monotonic" i.e. nondecreasing. Signed-off-by: Leo Izen <leo.izen@gmail.com> --- fftools/ffmpeg_mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)