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
410f717f
Commit
410f717f
authored
Feb 26, 2016
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/utils: Merge identical if conditions
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
bc7beb65
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
utils.c
libavcodec/utils.c
+1
-2
No files found.
libavcodec/utils.c
View file @
410f717f
...
...
@@ -864,8 +864,7 @@ static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags)
av_log
(
avctx
,
AV_LOG_ERROR
,
"video_get_buffer: image parameters invalid
\n
"
);
return
AVERROR
(
EINVAL
);
}
}
if
(
avctx
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
{
if
(
frame
->
width
<=
0
||
frame
->
height
<=
0
)
{
frame
->
width
=
FFMAX
(
avctx
->
width
,
AV_CEIL_RSHIFT
(
avctx
->
coded_width
,
avctx
->
lowres
));
frame
->
height
=
FFMAX
(
avctx
->
height
,
AV_CEIL_RSHIFT
(
avctx
->
coded_height
,
avctx
->
lowres
));
...
...
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