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
3636e791
Commit
3636e791
authored
Apr 25, 2011
by
Janne Grunau
Committed by
Diego Biurrun
Jun 15, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swscale: use SwsContext for av_log when available
Signed-off-by:
Diego Biurrun
<
diego@biurrun.de
>
parent
a60466db
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
utils.c
libswscale/utils.c
+4
-4
No files found.
libswscale/utils.c
View file @
3636e791
...
...
@@ -787,11 +787,11 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter)
unscaled
=
(
srcW
==
dstW
&&
srcH
==
dstH
);
if
(
!
isSupportedIn
(
srcFormat
))
{
av_log
(
NULL
,
AV_LOG_ERROR
,
"swScaler:
%s is not supported as input pixel format
\n
"
,
sws_format_name
(
srcFormat
));
av_log
(
c
,
AV_LOG_ERROR
,
"
%s is not supported as input pixel format
\n
"
,
sws_format_name
(
srcFormat
));
return
AVERROR
(
EINVAL
);
}
if
(
!
isSupportedOut
(
dstFormat
))
{
av_log
(
NULL
,
AV_LOG_ERROR
,
"swScaler:
%s is not supported as output pixel format
\n
"
,
sws_format_name
(
dstFormat
));
av_log
(
c
,
AV_LOG_ERROR
,
"
%s is not supported as output pixel format
\n
"
,
sws_format_name
(
dstFormat
));
return
AVERROR
(
EINVAL
);
}
...
...
@@ -807,12 +807,12 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter)
|
SWS_SPLINE
|
SWS_BICUBLIN
);
if
(
!
i
||
(
i
&
(
i
-
1
)))
{
av_log
(
NULL
,
AV_LOG_ERROR
,
"swScaler:
Exactly one scaler algorithm must be chosen
\n
"
);
av_log
(
c
,
AV_LOG_ERROR
,
"
Exactly one scaler algorithm must be chosen
\n
"
);
return
AVERROR
(
EINVAL
);
}
/* sanity check */
if
(
srcW
<
4
||
srcH
<
1
||
dstW
<
8
||
dstH
<
1
)
{
//FIXME check if these are enough and try to lowwer them after fixing the relevant parts of the code
av_log
(
NULL
,
AV_LOG_ERROR
,
"swScaler:
%dx%d -> %dx%d is invalid scaling dimension
\n
"
,
av_log
(
c
,
AV_LOG_ERROR
,
"
%dx%d -> %dx%d is invalid scaling dimension
\n
"
,
srcW
,
srcH
,
dstW
,
dstH
);
return
AVERROR
(
EINVAL
);
}
...
...
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