Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
85c83033
Commit
85c83033
authored
Aug 29, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: protect calls to frame_thread_encoder by HAVE_THREADS
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
e4fff08f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
utils.c
libavcodec/utils.c
+9
-7
No files found.
libavcodec/utils.c
View file @
85c83033
...
...
@@ -873,11 +873,13 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
if
(
!
HAVE_THREADS
)
av_log
(
avctx
,
AV_LOG_WARNING
,
"Warning: not compiled with thread support, using thread emulation
\n
"
);
entangled_thread_counter
--
;
//we will instanciate a few encoders thus kick the counter to prevent false detection of a problem
ret
=
ff_frame_thread_encoder_init
(
avctx
,
options
?
*
options
:
NULL
);
entangled_thread_counter
++
;
if
(
ret
<
0
)
goto
free_and_end
;
if
(
HAVE_THREADS
)
{
entangled_thread_counter
--
;
//we will instanciate a few encoders thus kick the counter to prevent false detection of a problem
ret
=
ff_frame_thread_encoder_init
(
avctx
,
options
?
*
options
:
NULL
);
entangled_thread_counter
++
;
if
(
ret
<
0
)
goto
free_and_end
;
}
if
(
HAVE_THREADS
&&
!
avctx
->
thread_opaque
&&
!
(
avctx
->
internal
->
frame_thread_encoder
&&
(
avctx
->
active_thread_type
&
FF_THREAD_FRAME
)))
{
...
...
@@ -1336,7 +1338,7 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
*
got_packet_ptr
=
0
;
if
(
avctx
->
internal
->
frame_thread_encoder
&&
(
avctx
->
active_thread_type
&
FF_THREAD_FRAME
))
if
(
HAVE_THREADS
&&
avctx
->
internal
->
frame_thread_encoder
&&
(
avctx
->
active_thread_type
&
FF_THREAD_FRAME
))
return
ff_thread_video_encode_frame
(
avctx
,
avpkt
,
frame
,
got_packet_ptr
);
if
(
!
(
avctx
->
codec
->
capabilities
&
CODEC_CAP_DELAY
)
&&
!
frame
)
{
...
...
@@ -1741,7 +1743,7 @@ av_cold int avcodec_close(AVCodecContext *avctx)
}
if
(
avcodec_is_open
(
avctx
))
{
if
(
avctx
->
internal
->
frame_thread_encoder
&&
avctx
->
thread_count
>
1
)
{
if
(
HAVE_THREADS
&&
avctx
->
internal
->
frame_thread_encoder
&&
avctx
->
thread_count
>
1
)
{
entangled_thread_counter
--
;
ff_frame_thread_encoder_free
(
avctx
);
entangled_thread_counter
++
;
...
...
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