History

avutil/frame: deprecate key_frame

James Almer committed 3 years ago

Commit 3e06f6f1 parent c7a86819 files · +33 −1Browse files

Showing the changes to libavcodec (2 of 9 files). Show all

Unified · Split

2 files
  1. libavcodec/decode.c +4 −0
  2. libavcodec/encode.c +4 −0
libavcodec/decode.c+4−0
@@ -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
576FF_DISABLE_DEPRECATION_WARNINGS
575 frame->key_frame = !!(frame->flags & AV_FRAME_FLAG_KEY);577 frame->key_frame = !!(frame->flags & AV_FRAME_FLAG_KEY);
578FF_ENABLE_DEPRECATION_WARNINGS
579#endif
576#if FF_API_INTERLACED_FRAME580#if FF_API_INTERLACED_FRAME
577FF_DISABLE_DEPRECATION_WARNINGS581FF_DISABLE_DEPRECATION_WARNINGS
578 frame->interlaced_frame = !!(frame->flags & AV_FRAME_FLAG_INTERLACED);582 frame->interlaced_frame = !!(frame->flags & AV_FRAME_FLAG_INTERLACED);
libavcodec/encode.c+4−0
@@ -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
196FF_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;
199FF_ENABLE_DEPRECATION_WARNINGS
200#endif
197#if FF_API_INTERLACED_FRAME201#if FF_API_INTERLACED_FRAME
198FF_DISABLE_DEPRECATION_WARNINGS202FF_DISABLE_DEPRECATION_WARNINGS
199 if (frame->interlaced_frame)203 if (frame->interlaced_frame)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t