Showing the changes to libavcodec (2 of 9 files). Show all
Unified · Split
| @@ -572,7 +572,11 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) · 571 unmodified lines | |||
| 572 | if (!ret) { | 572 | if (!ret) { |
| 573 | if (avctx->codec_type != AVMEDIA_TYPE_VIDEO) | 573 | if (avctx->codec_type != AVMEDIA_TYPE_VIDEO) |
| 574 | frame->flags |= AV_FRAME_FLAG_KEY; | 574 | frame->flags |= AV_FRAME_FLAG_KEY; |
| 575 | #if FF_API_FRAME_KEY | ||
| 576 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 575 | frame->key_frame = !!(frame->flags & AV_FRAME_FLAG_KEY); | 577 | frame->key_frame = !!(frame->flags & AV_FRAME_FLAG_KEY); |
| 578 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 579 | #endif | ||
| 576 | #if FF_API_INTERLACED_FRAME | 580 | #if FF_API_INTERLACED_FRAME |
| 577 | FF_DISABLE_DEPRECATION_WARNINGS | 581 | FF_DISABLE_DEPRECATION_WARNINGS |
| 578 | frame->interlaced_frame = !!(frame->flags & AV_FRAME_FLAG_INTERLACED); | 582 | frame->interlaced_frame = !!(frame->flags & AV_FRAME_FLAG_INTERLACED); |
| @@ -192,8 +192,12 @@ int ff_encode_get_frame(AVCodecContext *avctx, AVFrame *frame) · 191 unmodified lines | |||
| 192 | 192 | ||
| 193 | av_frame_move_ref(frame, avci->buffer_frame); | 193 | av_frame_move_ref(frame, avci->buffer_frame); |
| 194 | 194 | ||
| 195 | #if FF_API_FRAME_KEY | ||
| 196 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 195 | if (frame->key_frame) | 197 | if (frame->key_frame) |
| 196 | frame->flags |= AV_FRAME_FLAG_KEY; | 198 | frame->flags |= AV_FRAME_FLAG_KEY; |
| 199 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 200 | #endif | ||
| 197 | #if FF_API_INTERLACED_FRAME | 201 | #if FF_API_INTERLACED_FRAME |
| 198 | FF_DISABLE_DEPRECATION_WARNINGS | 202 | FF_DISABLE_DEPRECATION_WARNINGS |
| 199 | if (frame->interlaced_frame) | 203 | if (frame->interlaced_frame) |