Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
963ba769
Commit
963ba769
authored
May 13, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disabled GPU acceleration when using ffmpeg-mt.
It segfaults otherwise.
parent
bf4e7c9a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
13 deletions
+10
-13
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+10
-13
No files found.
modules/codec/avcodec/video.c
View file @
963ba769
...
@@ -332,29 +332,26 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
...
@@ -332,29 +332,26 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
p_sys
->
p_context
->
release_buffer
=
ffmpeg_ReleaseFrameBuf
;
p_sys
->
p_context
->
release_buffer
=
ffmpeg_ReleaseFrameBuf
;
p_sys
->
p_context
->
opaque
=
p_dec
;
p_sys
->
p_context
->
opaque
=
p_dec
;
#ifdef HAVE_AVCODEC_VA
const
bool
b_use_hw
=
var_CreateGetBool
(
p_dec
,
"ffmpeg-hw"
);
if
(
b_use_hw
)
p_sys
->
p_context
->
get_format
=
ffmpeg_GetFormat
;
#endif
#ifdef HAVE_AVCODEC_MT
#ifdef HAVE_AVCODEC_MT
int
i_thread_count
=
var_InheritInteger
(
p_dec
,
"ffmpeg-threads"
);
int
i_thread_count
=
var_InheritInteger
(
p_dec
,
"ffmpeg-threads"
);
if
(
i_thread_count
<=
0
)
if
(
i_thread_count
<=
0
)
i_thread_count
=
vlc_GetCPUCount
();
i_thread_count
=
vlc_GetCPUCount
();
msg_Dbg
(
p_dec
,
"allowing %d thread(s) for decoding"
,
i_thread_count
);
p_sys
->
p_context
->
thread_count
=
i_thread_count
;
#endif
#ifdef HAVE_AVCODEC_VA
#ifdef HAVE_AVCODEC_VA
const
bool
b_use_hw
=
var_CreateGetBool
(
p_dec
,
"ffmpeg-hw"
);
if
(
b_use_hw
)
if
(
b_use_hw
)
{
{
if
(
i_thread_count
>
1
)
#ifdef HAVE_AVCODEC_MT
msg_Err
(
p_dec
,
"ffmpeg-hw and ffmpeg-threads options are not compatible
"
);
msg_Err
(
p_dec
,
"ffmpeg-hw is not compatible with ffmpeg-mt
"
);
i_thread_count
=
1
;
#else
}
p_sys
->
p_context
->
get_format
=
ffmpeg_GetFormat
;
#endif
#endif
msg_Dbg
(
p_dec
,
"allowing %d thread(s) for decoding"
,
i_thread_count
);
}
p_sys
->
p_context
->
thread_count
=
i_thread_count
;
#endif
#endif
/* ***** misc init ***** */
/* ***** misc init ***** */
p_sys
->
i_pts
=
VLC_TS_INVALID
;
p_sys
->
i_pts
=
VLC_TS_INVALID
;
p_sys
->
b_has_b_frames
=
false
;
p_sys
->
b_has_b_frames
=
false
;
...
...
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