Message ID | GV1P250MB0737EDE14301F8BB66BAFBB78F0AA@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | 9732684ba2865d05306d0ec41febabec2b9c96e5 |
Headers | show |
Series | [FFmpeg-devel,1/3] avfilter/avfilter: Also deprecate variable name | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > Otherwise the var_names and the corresponding enum will be off > and e.g. the array holding the variable values will be too small. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavfilter/avfilter.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c > index 04887b6ee5..b8e1523bdb 100644 > --- a/libavfilter/avfilter.c > +++ b/libavfilter/avfilter.c > @@ -478,7 +478,9 @@ static int ff_request_frame_to_filter(AVFilterLink *link) > static const char *const var_names[] = { > "t", > "n", > +#if FF_API_FRAME_PKT > "pos", > +#endif > "w", > "h", > NULL Will apply this patchset tomorrow unless there are objections. - Andreas
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 04887b6ee5..b8e1523bdb 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -478,7 +478,9 @@ static int ff_request_frame_to_filter(AVFilterLink *link) static const char *const var_names[] = { "t", "n", +#if FF_API_FRAME_PKT "pos", +#endif "w", "h", NULL
Otherwise the var_names and the corresponding enum will be off and e.g. the array holding the variable values will be too small. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavfilter/avfilter.c | 2 ++ 1 file changed, 2 insertions(+)