Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
f7e85ee9
Commit
f7e85ee9
authored
Jan 01, 2014
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: allow the caller to override dimensions in ff_get_buffer()
This will be useful for allocating edges in the encoders.
parent
0d43b114
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
utils.c
libavcodec/utils.c
+7
-3
No files found.
libavcodec/utils.c
View file @
f7e85ee9
...
...
@@ -572,12 +572,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
int
ff_get_buffer
(
AVCodecContext
*
avctx
,
AVFrame
*
frame
,
int
flags
)
{
int
override_dimensions
=
1
;
int
ret
;
switch
(
avctx
->
codec_type
)
{
case
AVMEDIA_TYPE_VIDEO
:
frame
->
width
=
FFMAX
(
avctx
->
width
,
avctx
->
coded_width
);
frame
->
height
=
FFMAX
(
avctx
->
height
,
avctx
->
coded_height
);
if
(
frame
->
width
<=
0
||
frame
->
height
<=
0
)
{
frame
->
width
=
FFMAX
(
avctx
->
width
,
avctx
->
coded_width
);
frame
->
height
=
FFMAX
(
avctx
->
height
,
avctx
->
coded_height
);
override_dimensions
=
0
;
}
if
(
frame
->
format
<
0
)
frame
->
format
=
avctx
->
pix_fmt
;
if
(
!
frame
->
sample_aspect_ratio
.
num
)
...
...
@@ -738,7 +742,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
ret
=
avctx
->
get_buffer2
(
avctx
,
frame
,
flags
);
if
(
avctx
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
{
if
(
avctx
->
codec_type
==
AVMEDIA_TYPE_VIDEO
&&
!
override_dimensions
)
{
frame
->
width
=
avctx
->
width
;
frame
->
height
=
avctx
->
height
;
}
...
...
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