Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
dfee5996
Commit
dfee5996
authored
Mar 14, 2013
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: force thread count to 1 when disabling due to ffmpeg-hw use.
parent
39cb8bd3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+2
-0
No files found.
modules/codec/avcodec/video.c
View file @
dfee5996
...
@@ -382,12 +382,14 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
...
@@ -382,12 +382,14 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
{
{
msg_Warn
(
p_dec
,
"threaded frame decoding is not compatible with ffmpeg-hw, disabled"
);
msg_Warn
(
p_dec
,
"threaded frame decoding is not compatible with ffmpeg-hw, disabled"
);
p_sys
->
p_context
->
thread_type
&=
~
FF_THREAD_FRAME
;
p_sys
->
p_context
->
thread_type
&=
~
FF_THREAD_FRAME
;
p_sys
->
p_context
->
thread_count
=
1
;
}
}
if
(
(
p_sys
->
p_context
->
thread_type
&
FF_THREAD_SLICE
)
&&
if
(
(
p_sys
->
p_context
->
thread_type
&
FF_THREAD_SLICE
)
&&
(
i_codec_id
==
CODEC_ID_MPEG1VIDEO
||
i_codec_id
==
CODEC_ID_MPEG2VIDEO
)
)
(
i_codec_id
==
CODEC_ID_MPEG1VIDEO
||
i_codec_id
==
CODEC_ID_MPEG2VIDEO
)
)
{
{
msg_Warn
(
p_dec
,
"threaded slice decoding is not compatible with ffmpeg-hw, disabled"
);
msg_Warn
(
p_dec
,
"threaded slice decoding is not compatible with ffmpeg-hw, disabled"
);
p_sys
->
p_context
->
thread_type
&=
~
FF_THREAD_SLICE
;
p_sys
->
p_context
->
thread_type
&=
~
FF_THREAD_SLICE
;
p_sys
->
p_context
->
thread_count
=
1
;
}
}
#endif
#endif
p_sys
->
p_context
->
get_format
=
ffmpeg_GetFormat
;
p_sys
->
p_context
->
get_format
=
ffmpeg_GetFormat
;
...
...
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