Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
85185578
Commit
85185578
authored
Jun 22, 2016
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guard
parent
0491d699
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
10 deletions
+1
-10
qtrleenc.c
libavcodec/qtrleenc.c
+1
-10
No files found.
libavcodec/qtrleenc.c
View file @
85185578
...
@@ -363,9 +363,6 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -363,9 +363,6 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const
AVFrame
*
pict
,
int
*
got_packet
)
const
AVFrame
*
pict
,
int
*
got_packet
)
{
{
QtrleEncContext
*
const
s
=
avctx
->
priv_data
;
QtrleEncContext
*
const
s
=
avctx
->
priv_data
;
#if FF_API_CODED_FRAME
enum
AVPictureType
pict_type
;
#endif
int
ret
;
int
ret
;
if
((
ret
=
ff_alloc_packet2
(
avctx
,
pkt
,
s
->
max_buf_size
,
0
))
<
0
)
if
((
ret
=
ff_alloc_packet2
(
avctx
,
pkt
,
s
->
max_buf_size
,
0
))
<
0
)
...
@@ -373,15 +370,9 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -373,15 +370,9 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if
(
avctx
->
gop_size
==
0
||
(
s
->
avctx
->
frame_number
%
avctx
->
gop_size
)
==
0
)
{
if
(
avctx
->
gop_size
==
0
||
(
s
->
avctx
->
frame_number
%
avctx
->
gop_size
)
==
0
)
{
/* I-Frame */
/* I-Frame */
#if FF_API_CODED_FRAME
pict_type
=
AV_PICTURE_TYPE_I
;
#endif
s
->
key_frame
=
1
;
s
->
key_frame
=
1
;
}
else
{
}
else
{
/* P-Frame */
/* P-Frame */
#if FF_API_CODED_FRAME
pict_type
=
AV_PICTURE_TYPE_P
;
#endif
s
->
key_frame
=
0
;
s
->
key_frame
=
0
;
}
}
...
@@ -398,7 +389,7 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -398,7 +389,7 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
#if FF_API_CODED_FRAME
#if FF_API_CODED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
FF_DISABLE_DEPRECATION_WARNINGS
avctx
->
coded_frame
->
key_frame
=
s
->
key_frame
;
avctx
->
coded_frame
->
key_frame
=
s
->
key_frame
;
avctx
->
coded_frame
->
pict_type
=
pict_type
;
avctx
->
coded_frame
->
pict_type
=
s
->
key_frame
?
AV_PICTURE_TYPE_I
:
AV_PICTURE_TYPE_P
;
FF_ENABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS
#endif
#endif
...
...
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