f_decoder_wrapper: don't wait on self thread progress on reinit

Fixes deadlock when reinit is triggered by the thread itself.

Kacper Michajłow committed 1 year ago

Commit 50cda601 parent f59ee851 file · +7 −1Browse files

Unified · Split

     return !!p->decoder;
 }
+static bool decoder_wrapper_reinit(struct mp_decoder_wrapper *d)
+{
+    struct priv *p = d->f->priv;
+    return reinit_decoder(p);
+}
 bool mp_decoder_wrapper_reinit(struct mp_decoder_wrapper *d)
 {
     struct priv *p = d->f->priv;
         if (new_segment->segmented) {
             if (p->codec != new_segment->codec) {
                 p->codec = new_segment->codec;
-                if (!mp_decoder_wrapper_reinit(&p->public))
+                if (!decoder_wrapper_reinit(&p->public))
                     mp_filter_internal_mark_failed(p->decf);
             }

Keyboard shortcuts