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
a7f46586
Commit
a7f46586
authored
Feb 18, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ff_get_buffer(): allocate the frame for max(coded,display) dimensions
Needed e.g. for h264 cropping to work properly.
parent
505642f1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
5 deletions
+13
-5
utils.c
libavcodec/utils.c
+13
-5
No files found.
libavcodec/utils.c
View file @
a7f46586
...
...
@@ -555,10 +555,8 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
switch
(
avctx
->
codec_type
)
{
case
AVMEDIA_TYPE_VIDEO
:
if
(
!
frame
->
width
)
frame
->
width
=
avctx
->
width
;
if
(
!
frame
->
height
)
frame
->
height
=
avctx
->
height
;
frame
->
width
=
FFMAX
(
avctx
->
width
,
avctx
->
coded_width
);
frame
->
height
=
FFMAX
(
avctx
->
height
,
avctx
->
coded_height
);
if
(
frame
->
format
<
0
)
frame
->
format
=
avctx
->
pix_fmt
;
if
(
!
frame
->
sample_aspect_ratio
.
num
)
...
...
@@ -702,6 +700,9 @@ do { \
av_buffer_unref
(
&
dummy_buf
);
frame
->
width
=
avctx
->
width
;
frame
->
height
=
avctx
->
height
;
return
0
;
fail:
...
...
@@ -712,7 +713,14 @@ fail:
}
#endif
return
avctx
->
get_buffer2
(
avctx
,
frame
,
flags
);
ret
=
avctx
->
get_buffer2
(
avctx
,
frame
,
flags
);
if
(
avctx
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
{
frame
->
width
=
avctx
->
width
;
frame
->
height
=
avctx
->
height
;
}
return
ret
;
}
int
ff_reget_buffer
(
AVCodecContext
*
avctx
,
AVFrame
*
frame
)
...
...
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