Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
e6d165e3
Commit
e6d165e3
authored
Apr 27, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: missing lock in get_format()
Pointed-out-by:
Thomas Guillem
<
thomas@gllm.fr
>
parent
73d8e11f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+5
-0
No files found.
modules/codec/avcodec/video.c
View file @
e6d165e3
...
@@ -1122,6 +1122,8 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
...
@@ -1122,6 +1122,8 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
if
(
!
can_hwaccel
)
if
(
!
can_hwaccel
)
return
swfmt
;
return
swfmt
;
wait_mt
(
p_sys
);
for
(
size_t
i
=
0
;
pi_fmt
[
i
]
!=
PIX_FMT_NONE
;
i
++
)
for
(
size_t
i
=
0
;
pi_fmt
[
i
]
!=
PIX_FMT_NONE
;
i
++
)
{
{
enum
PixelFormat
hwfmt
=
pi_fmt
[
i
];
enum
PixelFormat
hwfmt
=
pi_fmt
[
i
];
...
@@ -1147,6 +1149,8 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
...
@@ -1147,6 +1149,8 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
continue
;
continue
;
}
}
post_mt
(
p_sys
);
if
(
va
->
description
!=
NULL
)
if
(
va
->
description
!=
NULL
)
msg_Info
(
p_dec
,
"Using %s for hardware decoding"
,
va
->
description
);
msg_Info
(
p_dec
,
"Using %s for hardware decoding"
,
va
->
description
);
...
@@ -1159,6 +1163,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
...
@@ -1159,6 +1163,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
return
pi_fmt
[
i
];
return
pi_fmt
[
i
];
}
}
post_mt
(
p_sys
);
/* Fallback to default behaviour */
/* Fallback to default behaviour */
return
swfmt
;
return
swfmt
;
}
}
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