mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-14 23:34:08 +00:00
libff: Fix a race condition crash when handling clocks
How to crash: 1. Use recent ffmpeg shared libraries. 2. Add a ffmpeg_source, a small static picture (e.g. jpeg) with loop 3. After a while of high cpu usage, it crashed. Seems reproduced more easily on faster computer Closes #533
This commit is contained in:
parent
0c8a3ec41a
commit
a9b9b26afd
4
deps/libff/libff/ff-demuxer.c
vendored
4
deps/libff/libff/ff-demuxer.c
vendored
|
@ -342,15 +342,15 @@ void ff_demuxer_reset(struct ff_demuxer *demuxer)
|
|||
packet.clock = clock;
|
||||
|
||||
if (demuxer->audio_decoder != NULL) {
|
||||
ff_clock_retain(clock);
|
||||
packet_queue_put(&demuxer->audio_decoder->packet_queue,
|
||||
&packet);
|
||||
ff_clock_retain(clock);
|
||||
}
|
||||
|
||||
if (demuxer->video_decoder != NULL) {
|
||||
ff_clock_retain(clock);
|
||||
packet_queue_put(&demuxer->video_decoder->packet_queue,
|
||||
&packet);
|
||||
ff_clock_retain(clock);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue