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
c99307ca
Commit
c99307ca
authored
Nov 30, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpegvideo: make frame_size_alloc() static.
It is not called from outside of mpegvideo.c anymore.
parent
0b0a7a75
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
mpegvideo.c
libavcodec/mpegvideo.c
+4
-4
mpegvideo.h
libavcodec/mpegvideo.h
+0
-1
No files found.
libavcodec/mpegvideo.c
View file @
c99307ca
...
...
@@ -191,7 +191,7 @@ av_cold int ff_dct_common_init(MpegEncContext *s)
return
0
;
}
int
ff_mpv_
frame_size_alloc
(
MpegEncContext
*
s
,
int
linesize
)
static
int
frame_size_alloc
(
MpegEncContext
*
s
,
int
linesize
)
{
int
alloc_size
=
FFALIGN
(
FFABS
(
linesize
)
+
32
,
32
);
...
...
@@ -270,7 +270,7 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
}
if
(
!
s
->
edge_emu_buffer
&&
(
ret
=
f
f_mpv_f
rame_size_alloc
(
s
,
pic
->
f
.
linesize
[
0
]))
<
0
)
{
(
ret
=
frame_size_alloc
(
s
,
pic
->
f
.
linesize
[
0
]))
<
0
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed to allocate context scratch buffers.
\n
"
);
ff_mpeg_unref_picture
(
s
,
pic
);
...
...
@@ -636,7 +636,7 @@ int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src)
if
(
dst
->
avctx
->
codec_tag
==
AV_RL32
(
"VCR2"
))
exchange_uv
(
dst
);
if
(
!
dst
->
edge_emu_buffer
&&
(
ret
=
f
f_mpv_f
rame_size_alloc
(
dst
,
dst
->
linesize
))
<
0
)
{
(
ret
=
frame_size_alloc
(
dst
,
dst
->
linesize
))
<
0
)
{
av_log
(
dst
->
avctx
,
AV_LOG_ERROR
,
"failed to allocate context "
"scratch buffers.
\n
"
);
return
ret
;
...
...
@@ -743,7 +743,7 @@ do {\
// linesize dependend scratch buffer allocation
if
(
!
s
->
edge_emu_buffer
)
if
(
s1
->
linesize
)
{
if
(
f
f_mpv_f
rame_size_alloc
(
s
,
s1
->
linesize
)
<
0
)
{
if
(
frame_size_alloc
(
s
,
s1
->
linesize
)
<
0
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"Failed to allocate context "
"scratch buffers.
\n
"
);
return
AVERROR
(
ENOMEM
);
...
...
libavcodec/mpegvideo.h
View file @
c99307ca
...
...
@@ -772,7 +772,6 @@ void ff_MPV_common_defaults(MpegEncContext *s);
void
ff_MPV_decode_defaults
(
MpegEncContext
*
s
);
int
ff_MPV_common_init
(
MpegEncContext
*
s
);
int
ff_mpv_frame_size_alloc
(
MpegEncContext
*
s
,
int
linesize
);
int
ff_MPV_common_frame_size_change
(
MpegEncContext
*
s
);
void
ff_MPV_common_end
(
MpegEncContext
*
s
);
void
ff_MPV_decode_mb
(
MpegEncContext
*
s
,
int16_t
block
[
12
][
64
]);
...
...
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