Showing the changes to libavfilter (4 of 9 files). Show all
Unified · Split
| @@ -256,8 +256,12 @@ FF_DISABLE_DEPRECATION_WARNINGS · 255 unmodified lines | |||
| 256 | FF_ENABLE_DEPRECATION_WARNINGS | 256 | FF_ENABLE_DEPRECATION_WARNINGS |
| 257 | #endif | 257 | #endif |
| 258 | 258 | ||
| 259 | #if FF_API_FRAME_KEY | ||
| 260 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 259 | if (copy->key_frame) | 261 | if (copy->key_frame) |
| 260 | copy->flags |= AV_FRAME_FLAG_KEY; | 262 | copy->flags |= AV_FRAME_FLAG_KEY; |
| 263 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 264 | #endif | ||
| 261 | 265 | ||
| 262 | ret = ff_filter_frame(ctx->outputs[0], copy); | 266 | ret = ff_filter_frame(ctx->outputs[0], copy); |
| 263 | if (ret < 0) | 267 | if (ret < 0) |
| @@ -301,7 +301,9 @@ static int request_frame(AVFilterLink *link) · 300 unmodified lines | |||
| 301 | 301 | ||
| 302 | frame->pts = ctx->pts; | 302 | frame->pts = ctx->pts; |
| 303 | frame->duration = 1; | 303 | frame->duration = 1; |
| 304 | #if FF_API_FRAME_KEY | ||
| 304 | frame->key_frame = 1; | 305 | frame->key_frame = 1; |
| 306 | #endif | ||
| 305 | frame->flags |= AV_FRAME_FLAG_KEY | 307 | frame->flags |= AV_FRAME_FLAG_KEY |
| 306 | #if FF_API_INTERLACED_FRAME | 308 | #if FF_API_INTERLACED_FRAME |
| 307 | frame->interlaced_frame = 0; | 309 | frame->interlaced_frame = 0; |
| @@ -397,7 +397,12 @@ static int activate(AVFilterContext *ctx) · 396 unmodified lines | |||
| 397 | if (!frame) | 397 | if (!frame) |
| 398 | return AVERROR(ENOMEM); | 398 | return AVERROR(ENOMEM); |
| 399 | 399 | ||
| 400 | #if FF_API_FRAME_KEY | ||
| 401 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 400 | frame->key_frame = 1; | 402 | frame->key_frame = 1; |
| 403 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 404 | #endif | ||
| 405 | |||
| 401 | frame->flags |= AV_FRAME_FLAG_KEY; | 406 | frame->flags |= AV_FRAME_FLAG_KEY; |
| 402 | #if FF_API_INTERLACED_FRAME | 407 | #if FF_API_INTERLACED_FRAME |
| 403 | FF_DISABLE_DEPRECATION_WARNINGS | 408 | FF_DISABLE_DEPRECATION_WARNINGS |
| @@ -184,7 +184,11 @@ static int activate(AVFilterContext *ctx) · 183 unmodified lines | |||
| 184 | return AVERROR(ENOMEM); | 184 | return AVERROR(ENOMEM); |
| 185 | frame->pts = test->pts; | 185 | frame->pts = test->pts; |
| 186 | frame->duration = 1; | 186 | frame->duration = 1; |
| 187 | #if FF_API_PKT_DURATION | ||
| 188 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 187 | frame->key_frame = 1; | 189 | frame->key_frame = 1; |
| 190 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 191 | #endif | ||
| 188 | frame->flags |= AV_FRAME_FLAG_KEY; | 192 | frame->flags |= AV_FRAME_FLAG_KEY; |
| 189 | #if FF_API_INTERLACED_FRAME | 193 | #if FF_API_INTERLACED_FRAME |
| 190 | FF_DISABLE_DEPRECATION_WARNINGS | 194 | FF_DISABLE_DEPRECATION_WARNINGS |