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
763d69bf
Commit
763d69bf
authored
May 03, 2016
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add some more deprecation guards
Avoids unused function/label/variable warnings after the next version bump.
parent
b7e64fba
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
0 deletions
+10
-0
avconv.c
avconv.c
+2
-0
error_resilience.c
libavcodec/error_resilience.c
+2
-0
qtrleenc.c
libavcodec/qtrleenc.c
+6
-0
No files found.
avconv.c
View file @
763d69bf
...
@@ -569,10 +569,12 @@ error:
...
@@ -569,10 +569,12 @@ error:
exit_program
(
1
);
exit_program
(
1
);
}
}
#if FF_API_CODED_FRAME
static
double
psnr
(
double
d
)
static
double
psnr
(
double
d
)
{
{
return
-
10
.
0
*
log
(
d
)
/
log
(
10
.
0
);
return
-
10
.
0
*
log
(
d
)
/
log
(
10
.
0
);
}
}
#endif
static
void
do_video_stats
(
OutputStream
*
ost
,
int
frame_size
)
static
void
do_video_stats
(
OutputStream
*
ost
,
int
frame_size
)
{
{
...
...
libavcodec/error_resilience.c
View file @
763d69bf
...
@@ -1199,7 +1199,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
...
@@ -1199,7 +1199,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
s
->
mb_height
,
linesize
[
2
],
0
);
s
->
mb_height
,
linesize
[
2
],
0
);
}
}
#if FF_API_XVMC
ec_clean:
ec_clean:
#endif
/* clean a few tables */
/* clean a few tables */
for
(
i
=
0
;
i
<
s
->
mb_num
;
i
++
)
{
for
(
i
=
0
;
i
<
s
->
mb_num
;
i
++
)
{
const
int
mb_xy
=
s
->
mb_index2xy
[
i
];
const
int
mb_xy
=
s
->
mb_index2xy
[
i
];
...
...
libavcodec/qtrleenc.c
View file @
763d69bf
...
@@ -297,7 +297,9 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -297,7 +297,9 @@ 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
;
enum
AVPictureType
pict_type
;
#endif
int
ret
;
int
ret
;
if
((
ret
=
ff_alloc_packet
(
pkt
,
s
->
max_buf_size
))
<
0
)
{
if
((
ret
=
ff_alloc_packet
(
pkt
,
s
->
max_buf_size
))
<
0
)
{
...
@@ -308,11 +310,15 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -308,11 +310,15 @@ 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
;
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
;
pict_type
=
AV_PICTURE_TYPE_P
;
#endif
s
->
key_frame
=
0
;
s
->
key_frame
=
0
;
}
}
...
...
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