[FFmpeg-devel] correct the max value of swscale option with type AV_OPT_TYPE_PIXEL_FMT

Submitted by Guo, Yejun on Oct. 30, 2018, 6:52 p.m.

Details

Message ID 1540925556-28065-1-git-send-email-yejun.guo@intel.com
State New
Headers show

Commit Message

Guo, Yejun Oct. 30, 2018, 6:52 p.m.
Signed-off-by: Guo, Yejun <yejun.guo@intel.com>
---
 libswscale/options.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Paul B Mahol Oct. 30, 2018, 11:03 a.m.
On 10/30/18, Guo, Yejun <yejun.guo@intel.com> wrote:
> Signed-off-by: Guo, Yejun <yejun.guo@intel.com>
> ---
>  libswscale/options.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libswscale/options.c b/libswscale/options.c
> index 7eb2752..db8210b 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_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_format",      "source format",
> OFFSET(srcFormat), AV_OPT_TYPE_PIXEL_FMT,{ .i64 = DEFAULT          }, 0,
>   AV_PIX_FMT_NB,  VE },
> +    { "dst_format",      "destination format",
> OFFSET(dstFormat), AV_OPT_TYPE_PIXEL_FMT,{ .i64 = DEFAULT          }, 0,
>   AV_PIX_FMT_NB,  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 },
> --
> 2.7.4


This is wrong, First it does not uses NB-1 and second it is not needed at all.

Patch hide | download patch | download mbox

diff --git a/libswscale/options.c b/libswscale/options.c
index 7eb2752..db8210b 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_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_format",      "source format",                 OFFSET(srcFormat), AV_OPT_TYPE_PIXEL_FMT,{ .i64 = DEFAULT          }, 0,       AV_PIX_FMT_NB,  VE },
+    { "dst_format",      "destination format",            OFFSET(dstFormat), AV_OPT_TYPE_PIXEL_FMT,{ .i64 = DEFAULT          }, 0,       AV_PIX_FMT_NB,  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 },