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
7bc533c4
Commit
7bc533c4
authored
Oct 16, 2012
by
Stefano Sabatini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/utils: fix a few case/punctuation inconsistencies in avcodec_open2()
parent
1cd9c81d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
utils.c
libavcodec/utils.c
+5
-5
No files found.
libavcodec/utils.c
View file @
7bc533c4
...
...
@@ -830,12 +830,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
return
0
;
if
((
!
codec
&&
!
avctx
->
codec
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"No codec provided to avcodec_open2()
.
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"No codec provided to avcodec_open2()
\n
"
);
return
AVERROR
(
EINVAL
);
}
if
((
codec
&&
avctx
->
codec
&&
codec
!=
avctx
->
codec
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"This AVCodecContext was allocated for %s, "
"but %s passed to avcodec_open2()
.
\n
"
,
avctx
->
codec
->
name
,
codec
->
name
);
"but %s passed to avcodec_open2()
\n
"
,
avctx
->
codec
->
name
,
codec
->
name
);
return
AVERROR
(
EINVAL
);
}
if
(
!
codec
)
...
...
@@ -855,7 +855,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
entangled_thread_counter
++
;
if
(
entangled_thread_counter
!=
1
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"
i
nsufficient thread locking around avcodec_open/close()
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"
I
nsufficient thread locking around avcodec_open/close()
\n
"
);
ret
=
-
1
;
goto
end
;
}
...
...
@@ -908,7 +908,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
if
((
avctx
->
coded_width
||
avctx
->
coded_height
||
avctx
->
width
||
avctx
->
height
)
&&
(
av_image_check_size
(
avctx
->
coded_width
,
avctx
->
coded_height
,
0
,
avctx
)
<
0
||
av_image_check_size
(
avctx
->
width
,
avctx
->
height
,
0
,
avctx
)
<
0
))
{
av_log
(
avctx
,
AV_LOG_WARNING
,
"
i
gnoring invalid width/height values
\n
"
);
av_log
(
avctx
,
AV_LOG_WARNING
,
"
I
gnoring invalid width/height values
\n
"
);
avcodec_set_dimensions
(
avctx
,
0
,
0
);
}
...
...
@@ -931,7 +931,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
}
if
(
avctx
->
codec_id
!=
codec
->
id
||
(
avctx
->
codec_type
!=
codec
->
type
&&
avctx
->
codec_type
!=
AVMEDIA_TYPE_ATTACHMENT
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"
c
odec type or id mismatches
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"
C
odec type or id mismatches
\n
"
);
ret
=
AVERROR
(
EINVAL
);
goto
free_and_end
;
}
...
...
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