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
d1cf4591
Commit
d1cf4591
authored
Jul 11, 2011
by
Ronald S. Bultje
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vp8/mt: flush worker thread, not application thread context, on seek.
This prevents a crash when seeking.
parent
5eafc8b4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
pthread.c
libavcodec/pthread.c
+6
-3
utils.c
libavcodec/utils.c
+1
-1
No files found.
libavcodec/pthread.c
View file @
d1cf4591
...
...
@@ -747,9 +747,12 @@ void ff_thread_flush(AVCodecContext *avctx)
if
(
!
avctx
->
thread_opaque
)
return
;
park_frame_worker_threads
(
fctx
,
avctx
->
thread_count
);
if
(
fctx
->
prev_thread
)
update_context_from_thread
(
fctx
->
threads
->
avctx
,
fctx
->
prev_thread
->
avctx
,
0
);
if
(
fctx
->
prev_thread
)
{
if
(
fctx
->
prev_thread
!=
&
fctx
->
threads
[
0
])
update_context_from_thread
(
fctx
->
threads
[
0
].
avctx
,
fctx
->
prev_thread
->
avctx
,
0
);
if
(
avctx
->
codec
->
flush
)
avctx
->
codec
->
flush
(
fctx
->
threads
[
0
].
avctx
);
}
fctx
->
next_decoding
=
fctx
->
next_finished
=
0
;
fctx
->
delaying
=
1
;
...
...
libavcodec/utils.c
View file @
d1cf4591
...
...
@@ -1080,7 +1080,7 @@ void avcodec_flush_buffers(AVCodecContext *avctx)
{
if
(
HAVE_PTHREADS
&&
avctx
->
active_thread_type
&
FF_THREAD_FRAME
)
ff_thread_flush
(
avctx
);
if
(
avctx
->
codec
->
flush
)
else
if
(
avctx
->
codec
->
flush
)
avctx
->
codec
->
flush
(
avctx
);
}
...
...
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