Deprecated in 2015 in 8bc708fcee1
Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -211,11 +211,6 @@ static const AVOption delogo_options[]= { · 210 unmodified lines | ||
| 211 | 211 | { "y", "set logo y position", OFFSET(y_expr), AV_OPT_TYPE_STRING, { .str = "-1" }, 0, 0, FLAGS }, |
| 212 | 212 | { "w", "set logo width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "-1" }, 0, 0, FLAGS }, |
| 213 | 213 | { "h", "set logo height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "-1" }, 0, 0, FLAGS }, |
| 214 | −#if LIBAVFILTER_VERSION_MAJOR < 7 | |
| 215 | − /* Actual default value for band/t is 1, set in init */ | |
| 216 | − { "band", "set delogo area band size", OFFSET(band), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, | |
| 217 | − { "t", "set delogo area band size", OFFSET(band), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, | |
| 218 | −#endif | |
| 219 | 214 | { "show", "show delogo area", OFFSET(show), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, FLAGS }, |
| 220 | 215 | { NULL } |
| 221 | 216 | }; |
| @@ -272,16 +267,8 @@ static av_cold int init(AVFilterContext *ctx) · 50 unmodified lines | ||
| 272 | 267 | CHECK_UNSET_OPT(w); |
| 273 | 268 | CHECK_UNSET_OPT(h); |
| 274 | 269 | |
| 275 | −#if LIBAVFILTER_VERSION_MAJOR < 7 | |
| 276 | − if (s->band == 0) { /* Unset, use default */ | |
| 277 | − av_log(ctx, AV_LOG_WARNING, "Note: default band value was changed from 4 to 1.\n"); | |
| 278 | − s->band = 1; | |
| 279 | − } else if (s->band != 1) { | |
| 280 | − av_log(ctx, AV_LOG_WARNING, "Option band is deprecated.\n"); | |
| 281 | − } | |
| 282 | −#else | |
| 283 | 270 | s->band = 1; |
| 284 | −#endif | |
| 271 | + | |
| 285 | 272 | av_log(ctx, AV_LOG_VERBOSE, "x:%d y:%d, w:%d h:%d band:%d show:%d\n", |
| 286 | 273 | s->x, s->y, s->w, s->h, s->band, s->show); |
| 287 | 274 | |