diff mbox

[FFmpeg-devel] lavfi/transpose: add missing const options flags

Message ID 20161227083742.27365-1-u@pkh.me
State Accepted
Commit 571a36015738b081dea1893fd7e5f193a51d6438
Headers show

Commit Message

Clément Bœsch Dec. 27, 2016, 8:37 a.m. UTC 
Fixes ffmpeg -h filter=transpose

---
Should we instead ignore the flags for AV_OPT_TYPE_CONST?
---
 libavfilter/vf_transpose.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Paul B Mahol Dec. 27, 2016, 10:31 a.m. UTC | #1 
On 12/27/16, Clement Boesch <u@pkh.me> wrote:
> Fixes ffmpeg -h filter=transpose
>
> ---
> Should we instead ignore the flags for AV_OPT_TYPE_CONST?
> ---
>  libavfilter/vf_transpose.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
> index 28226c3cfd..75b4dda41f 100644
> --- a/libavfilter/vf_transpose.c
> +++ b/libavfilter/vf_transpose.c
> @@ -260,10 +260,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame
> *in)
>
>  static const AVOption transpose_options[] = {
>      { "dir", "set transpose direction", OFFSET(dir), AV_OPT_TYPE_INT, {
> .i64 = TRANSPOSE_CCLOCK_FLIP }, 0, 7, FLAGS, "dir" },
> -        { "cclock_flip", "rotate counter-clockwise with vertical flip", 0,
> AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .unit = "dir" },
> -        { "clock",       "rotate clockwise",                            0,
> AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK       }, .unit = "dir" },
> -        { "cclock",      "rotate counter-clockwise",                    0,
> AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK      }, .unit = "dir" },
> -        { "clock_flip",  "rotate clockwise with vertical flip",         0,
> AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP  }, .unit = "dir" },
> +        { "cclock_flip", "rotate counter-clockwise with vertical flip", 0,
> AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .flags=FLAGS, .unit =
> "dir" },
> +        { "clock",       "rotate clockwise",                            0,
> AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK       }, .flags=FLAGS, .unit =
> "dir" },
> +        { "cclock",      "rotate counter-clockwise",                    0,
> AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK      }, .flags=FLAGS, .unit =
> "dir" },
> +        { "clock_flip",  "rotate clockwise with vertical flip",         0,
> AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP  }, .flags=FLAGS, .unit =
> "dir" },
>
>      { "passthrough", "do not apply transposition if the input matches the
> specified geometry",
>        OFFSET(passthrough), AV_OPT_TYPE_INT, {.i64=TRANSPOSE_PT_TYPE_NONE},
> 0, INT_MAX, FLAGS, "passthrough" },
> --
> 2.11.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

lgtm
Clément Bœsch Dec. 27, 2016, 10:54 p.m. UTC | #2 
On Tue, Dec 27, 2016 at 11:31:17AM +0100, Paul B Mahol wrote:
> On 12/27/16, Clement Boesch <u@pkh.me> wrote:
> > Fixes ffmpeg -h filter=transpose
> >
> > ---
> > Should we instead ignore the flags for AV_OPT_TYPE_CONST?
> > ---
> >  libavfilter/vf_transpose.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
> > index 28226c3cfd..75b4dda41f 100644
> > --- a/libavfilter/vf_transpose.c
> > +++ b/libavfilter/vf_transpose.c
> > @@ -260,10 +260,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame
> > *in)
> >
> >  static const AVOption transpose_options[] = {
> >      { "dir", "set transpose direction", OFFSET(dir), AV_OPT_TYPE_INT, {
> > .i64 = TRANSPOSE_CCLOCK_FLIP }, 0, 7, FLAGS, "dir" },
> > -        { "cclock_flip", "rotate counter-clockwise with vertical flip", 0,
> > AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .unit = "dir" },
> > -        { "clock",       "rotate clockwise",                            0,
> > AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK       }, .unit = "dir" },
> > -        { "cclock",      "rotate counter-clockwise",                    0,
> > AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK      }, .unit = "dir" },
> > -        { "clock_flip",  "rotate clockwise with vertical flip",         0,
> > AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP  }, .unit = "dir" },
> > +        { "cclock_flip", "rotate counter-clockwise with vertical flip", 0,
> > AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .flags=FLAGS, .unit =
> > "dir" },
> > +        { "clock",       "rotate clockwise",                            0,
> > AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK       }, .flags=FLAGS, .unit =
> > "dir" },
> > +        { "cclock",      "rotate counter-clockwise",                    0,
> > AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK      }, .flags=FLAGS, .unit =
> > "dir" },
> > +        { "clock_flip",  "rotate clockwise with vertical flip",         0,
> > AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP  }, .flags=FLAGS, .unit =
> > "dir" },
> >
> >      { "passthrough", "do not apply transposition if the input matches the
> > specified geometry",
> >        OFFSET(passthrough), AV_OPT_TYPE_INT, {.i64=TRANSPOSE_PT_TYPE_NONE},
> > 0, INT_MAX, FLAGS, "passthrough" },
> > --
> > 2.11.0
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel@ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> 
> lgtm

applied, thanks
diff mbox

Patch

diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
index 28226c3cfd..75b4dda41f 100644
--- a/libavfilter/vf_transpose.c
+++ b/libavfilter/vf_transpose.c
@@ -260,10 +260,10 @@  static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 
 static const AVOption transpose_options[] = {
     { "dir", "set transpose direction", OFFSET(dir), AV_OPT_TYPE_INT, { .i64 = TRANSPOSE_CCLOCK_FLIP }, 0, 7, FLAGS, "dir" },
-        { "cclock_flip", "rotate counter-clockwise with vertical flip", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .unit = "dir" },
-        { "clock",       "rotate clockwise",                            0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK       }, .unit = "dir" },
-        { "cclock",      "rotate counter-clockwise",                    0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK      }, .unit = "dir" },
-        { "clock_flip",  "rotate clockwise with vertical flip",         0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP  }, .unit = "dir" },
+        { "cclock_flip", "rotate counter-clockwise with vertical flip", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .flags=FLAGS, .unit = "dir" },
+        { "clock",       "rotate clockwise",                            0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK       }, .flags=FLAGS, .unit = "dir" },
+        { "cclock",      "rotate counter-clockwise",                    0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK      }, .flags=FLAGS, .unit = "dir" },
+        { "clock_flip",  "rotate clockwise with vertical flip",         0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP  }, .flags=FLAGS, .unit = "dir" },
 
     { "passthrough", "do not apply transposition if the input matches the specified geometry",
       OFFSET(passthrough), AV_OPT_TYPE_INT, {.i64=TRANSPOSE_PT_TYPE_NONE},  0, INT_MAX, FLAGS, "passthrough" },