Commit 1853e2cb authored by Michael Niedermayer's avatar Michael Niedermayer

avfilter/formats: Avoid using non public AV_SAMPLE_FMT_NB

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 0d26264f
......@@ -376,7 +376,7 @@ AVFilterFormats *ff_planar_sample_fmts(void)
AVFilterFormats *ret = NULL;
int fmt;
for (fmt = 0; fmt < AV_SAMPLE_FMT_NB; fmt++)
for (fmt = 0; av_get_bytes_per_sample(fmt)>0; fmt++)
if (av_sample_fmt_is_planar(fmt))
ff_add_format(&ret, fmt);
......@@ -587,7 +587,7 @@ int ff_parse_sample_format(int *ret, const char *arg, void *log_ctx)
int sfmt = av_get_sample_fmt(arg);
if (sfmt == AV_SAMPLE_FMT_NONE) {
sfmt = strtol(arg, &tail, 0);
if (*tail || (unsigned)sfmt >= AV_SAMPLE_FMT_NB) {
if (*tail || av_get_bytes_per_sample(sfmt)<=0) {
av_log(log_ctx, AV_LOG_ERROR, "Invalid sample format '%s'\n", arg);
return AVERROR(EINVAL);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment