Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
3e06f6f0
Commit
3e06f6f0
authored
Apr 12, 2023
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avutil/frame: deprecate key_frame
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
c7a86818
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
33 additions
and
1 deletion
+33
-1
decode.c
libavcodec/decode.c
+4
-0
encode.c
libavcodec/encode.c
+4
-0
buffersrc.c
libavfilter/buffersrc.c
+4
-0
vf_coreimage.m
libavfilter/vf_coreimage.m
+2
-0
vsrc_gradients.c
libavfilter/vsrc_gradients.c
+5
-0
vsrc_testsrc.c
libavfilter/vsrc_testsrc.c
+4
-0
frame.c
libavutil/frame.c
+4
-1
frame.h
libavutil/frame.h
+5
-0
version.h
libavutil/version.h
+1
-0
No files found.
libavcodec/decode.c
View file @
3e06f6f0
...
...
@@ -572,7 +572,11 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
if
(
!
ret
)
{
if
(
avctx
->
codec_type
!=
AVMEDIA_TYPE_VIDEO
)
frame
->
flags
|=
AV_FRAME_FLAG_KEY
;
#if FF_API_FRAME_KEY
FF_DISABLE_DEPRECATION_WARNINGS
frame
->
key_frame
=
!!
(
frame
->
flags
&
AV_FRAME_FLAG_KEY
);
FF_ENABLE_DEPRECATION_WARNINGS
#endif
#if FF_API_INTERLACED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
frame
->
interlaced_frame
=
!!
(
frame
->
flags
&
AV_FRAME_FLAG_INTERLACED
);
...
...
libavcodec/encode.c
View file @
3e06f6f0
...
...
@@ -192,8 +192,12 @@ int ff_encode_get_frame(AVCodecContext *avctx, AVFrame *frame)
av_frame_move_ref
(
frame
,
avci
->
buffer_frame
);
#if FF_API_FRAME_KEY
FF_DISABLE_DEPRECATION_WARNINGS
if
(
frame
->
key_frame
)
frame
->
flags
|=
AV_FRAME_FLAG_KEY
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
#if FF_API_INTERLACED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
if
(
frame
->
interlaced_frame
)
...
...
libavfilter/buffersrc.c
View file @
3e06f6f0
...
...
@@ -256,8 +256,12 @@ FF_DISABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS
#endif
#if FF_API_FRAME_KEY
FF_DISABLE_DEPRECATION_WARNINGS
if
(
copy
->
key_frame
)
copy
->
flags
|=
AV_FRAME_FLAG_KEY
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
ret
=
ff_filter_frame
(
ctx
->
outputs
[
0
],
copy
);
if
(
ret
<
0
)
...
...
libavfilter/vf_coreimage.m
View file @
3e06f6f0
...
...
@@ -301,7 +301,9 @@ static int request_frame(AVFilterLink *link)
frame
->
pts
=
ctx
->
pts
;
frame
->
duration
=
1
;
#if FF_API_FRAME_KEY
frame
->
key_frame
=
1
;
#endif
frame
->
flags
|=
AV_FRAME_FLAG_KEY
#if FF_API_INTERLACED_FRAME
frame
->
interlaced_frame
=
0
;
...
...
libavfilter/vsrc_gradients.c
View file @
3e06f6f0
...
...
@@ -397,7 +397,12 @@ static int activate(AVFilterContext *ctx)
if
(
!
frame
)
return
AVERROR
(
ENOMEM
);
#if FF_API_FRAME_KEY
FF_DISABLE_DEPRECATION_WARNINGS
frame
->
key_frame
=
1
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
frame
->
flags
|=
AV_FRAME_FLAG_KEY
;
#if FF_API_INTERLACED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
...
...
libavfilter/vsrc_testsrc.c
View file @
3e06f6f0
...
...
@@ -184,7 +184,11 @@ static int activate(AVFilterContext *ctx)
return
AVERROR
(
ENOMEM
);
frame
->
pts
=
test
->
pts
;
frame
->
duration
=
1
;
#if FF_API_PKT_DURATION
FF_DISABLE_DEPRECATION_WARNINGS
frame
->
key_frame
=
1
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
frame
->
flags
|=
AV_FRAME_FLAG_KEY
;
#if FF_API_INTERLACED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
...
...
libavutil/frame.c
View file @
3e06f6f0
...
...
@@ -55,7 +55,6 @@ FF_DISABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS
#endif
frame
->
time_base
=
(
AVRational
){
0
,
1
};
frame
->
key_frame
=
1
;
frame
->
sample_aspect_ratio
=
(
AVRational
){
0
,
1
};
frame
->
format
=
-
1
;
/* unknown */
frame
->
extended_data
=
frame
->
data
;
...
...
@@ -265,7 +264,11 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy)
{
int
ret
;
#if FF_API_FRAME_KEY
FF_DISABLE_DEPRECATION_WARNINGS
dst
->
key_frame
=
src
->
key_frame
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
dst
->
pict_type
=
src
->
pict_type
;
dst
->
sample_aspect_ratio
=
src
->
sample_aspect_ratio
;
dst
->
crop_top
=
src
->
crop_top
;
...
...
libavutil/frame.h
View file @
3e06f6f0
...
...
@@ -416,10 +416,15 @@ typedef struct AVFrame {
*/
int
format
;
#if FF_API_FRAME_KEY
/**
* 1 -> keyframe, 0-> not
*
* @deprecated Use AV_FRAME_FLAG_KEY instead
*/
attribute_deprecated
int
key_frame
;
#endif
/**
* Picture type of the frame.
...
...
libavutil/version.h
View file @
3e06f6f0
...
...
@@ -116,6 +116,7 @@
#define FF_API_HDR_VIVID_THREE_SPLINE (LIBAVUTIL_VERSION_MAJOR < 59)
#define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 59)
#define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 59)
#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 59)
/**
* @}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment