[FFmpeg-cvslog] doc/ffmpeg: document max_error_rate
ffmpeg | branch: master | Gyan Doshi | Sun Jan 10 19:32:37
2021 +0530| [0fff6c039c7e52c41ec003b5ab47b5adb3daeb48] | committer: Gyan Doshi
doc/ffmpeg: document max_error_rate
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fff6c039c7e52c41ec003b5ab47b5adb3daeb48
---
doc/ffmpeg.texi | 5 +
fftools/ffmpeg_opt.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 62015d7565..470ce961ce 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1739,6 +1739,11 @@ No packets were passed to the muxer, the output is empty.
No packets were passed to the muxer in some of the output streams.
@end table
+@item -max_error_rate (@emph{global})
+Set fraction of decoding frame failures across all inputs which when crossed
+ffmpeg will return exit code 69. Crossing this threshold does not terminate
+processing. Range is a floating-point number between 0 to 1. Default is 2/3.
+
@item -xerror (@emph{global})
Stop and exit on error
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index c295514401..fd923fce04 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -3586,7 +3586,7 @@ const OptionDef options[] = {
{ "debug_ts", OPT_BOOL | OPT_EXPERT, {
&debug_ts },
"print timestamp debugging info" },
{ "max_error_rate", HAS_ARG | OPT_FLOAT,{
&max_error_rate },
-"ratio of errors (0.0: no errors, 1.0: 100% errors) above which ffmpeg
returns an error instead of success.", "maximum error rate" },
+"ratio of decoding errors (0.0: no errors, 1.0: 100% errors) above
which ffmpeg returns an error instead of success.", "maximum error rate" },
{ "discard",OPT_STRING | HAS_ARG | OPT_SPEC |
OPT_INPUT, { .off =
OFFSET(discard) },
"discard", "" },
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_convolution: use correct stride variable
ffmpeg | branch: master | Paul B Mahol | Sun Jan 10 17:26:21
2021 +0100| [a0acc44106ea615cf378048fc721e7d5af871bf7] | committer: Paul B Mahol
avfilter/vf_convolution: use correct stride variable
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0acc44106ea615cf378048fc721e7d5af871bf7
---
libavfilter/vf_convolution.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c
index 0514c235a9..c238dae925 100644
--- a/libavfilter/vf_convolution.c
+++ b/libavfilter/vf_convolution.c
@@ -523,11 +523,11 @@ static int filter_slice(AVFilterContext *ctx, void *arg,
int jobnr, int nb_jobs)
for (y = slice_start; y < slice_end; y++) {
const int xoff = mode == MATRIX_COLUMN ? (y - slice_start) * bpc :
radius * bpc;
-const int yoff = mode == MATRIX_COLUMN ? radius * stride : 0;
+const int yoff = mode == MATRIX_COLUMN ? radius * dstride : 0;
for (x = 0; x < radius; x++) {
const int xoff = mode == MATRIX_COLUMN ? (y - slice_start) *
bpc : x * bpc;
-const int yoff = mode == MATRIX_COLUMN ? x * stride : 0;
+const int yoff = mode == MATRIX_COLUMN ? x * dstride : 0;
s->setup[plane](radius, c, src, stride, x, width, y, height,
bpc);
s->filter[plane](dst + yoff + xoff, 1, rdiv,
@@ -540,7 +540,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg,
int jobnr, int nb_jobs)
dstride, stride);
for (x = sizew - radius; x < sizew; x++) {
const int xoff = mode == MATRIX_COLUMN ? (y - slice_start) *
bpc : x * bpc;
-const int yoff = mode == MATRIX_COLUMN ? x * stride : 0;
+const int yoff = mode == MATRIX_COLUMN ? x * dstride : 0;
s->setup[plane](radius, c, src, stride, x, width, y, height,
bpc);
s->filter[plane](dst + yoff + xoff, 1, rdiv,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
