On 19.11.2016 02:41, Michael Niedermayer wrote:
> Found-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
> ---
> libswscale/options.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libswscale/options.c b/libswscale/options.c
> index c1ea336..7eb2752 100644
> --- a/libswscale/options.c
> +++ b/libswscale/options.c
> @@ -57,8 +57,8 @@ static const AVOption swscale_options[] = {
> { "srch", "source height", OFFSET(srcH),
> AV_OPT_TYPE_INT, { .i64 = 16 }, 1, INT_MAX,
> VE },
> { "dstw", "destination width", OFFSET(dstW),
> AV_OPT_TYPE_INT, { .i64 = 16 }, 1, INT_MAX,
> VE },
> { "dsth", "destination height", OFFSET(dstH),
> AV_OPT_TYPE_INT, { .i64 = 16 }, 1, INT_MAX,
> VE },
> - { "src_format", "source format", OFFSET(srcFormat),
> AV_OPT_TYPE_INT, { .i64 = DEFAULT }, 0, AV_PIX_FMT_NB -
> 1, VE },
> - { "dst_format", "destination format", OFFSET(dstFormat),
> AV_OPT_TYPE_INT, { .i64 = DEFAULT }, 0, AV_PIX_FMT_NB -
> 1, VE },
> + { "src_format", "source format", OFFSET(srcFormat),
> AV_OPT_TYPE_PIXEL_FMT,{ .i64 = DEFAULT }, 0, INT_MAX, VE },
> + { "dst_format", "destination format", OFFSET(dstFormat),
> AV_OPT_TYPE_PIXEL_FMT,{ .i64 = DEFAULT }, 0, INT_MAX, VE },
> { "src_range", "source is full range", OFFSET(srcRange),
> AV_OPT_TYPE_BOOL, { .i64 = DEFAULT }, 0, 1,
> VE },
> { "dst_range", "destination is full range", OFFSET(dstRange),
> AV_OPT_TYPE_BOOL, { .i64 = DEFAULT }, 0, 1,
> VE },
> { "param0", "scaler param 0", OFFSET(param[0]),
> AV_OPT_TYPE_DOUBLE, { .dbl = SWS_PARAM_DEFAULT }, INT_MIN, INT_MAX,
> VE },
>
Probably OK.
There are more occurrences, though.
$ git grep AV_PIX_FMT_NB -- libavc* libavd* libs*
libavcodec/imgconvert.c: if (pix_fmt < 0 || pix_fmt >= AV_PIX_FMT_NB)
libavcodec/imgconvert.c: if (pix_fmt < 0 || pix_fmt >= AV_PIX_FMT_NB)
libavcodec/tests/imgconvert.c: for (i=0; i<AV_PIX_FMT_NB*2; i++) {
libavdevice/lavfi.c: int *pix_fmts = create_all_formats(AV_PIX_FMT_NB);
libswscale/tests/swscale.c: srcFormat < AV_PIX_FMT_NB; srcFormat++) {
libswscale/tests/swscale.c: dstFormat < AV_PIX_FMT_NB; dstFormat++)
{
libswscale/utils.c:static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
libswscale/utils.c: return (unsigned)pix_fmt < AV_PIX_FMT_NB ?
libswscale/utils.c: return (unsigned)pix_fmt < AV_PIX_FMT_NB ?
libswscale/utils.c: return (unsigned)pix_fmt < AV_PIX_FMT_NB ?
Best regards,
Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
