47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9
|
|
|
|
--- a/src/input/decoder.c
|
|
+++ b/src/input/decoder.c
|
|
@@ -1162,7 +1162,10 @@
|
|
b_paused = p_owner->b_paused;
|
|
|
|
if (!p_audio)
|
|
+ {
|
|
+ vlc_mutex_unlock( &p_owner->lock );
|
|
break;
|
|
+ }
|
|
|
|
/* */
|
|
int i_rate = INPUT_RATE_DEFAULT;
|
|
@@ -1180,6 +1183,9 @@
|
|
|
|
if( unlikely(p_owner->b_paused != b_paused) )
|
|
continue; /* race with input thread? retry... */
|
|
+
|
|
+ vlc_mutex_unlock( &p_owner->lock );
|
|
+
|
|
if( p_aout == NULL )
|
|
b_reject = true;
|
|
|
|
@@ -1199,7 +1205,6 @@
|
|
|
|
break;
|
|
}
|
|
- vlc_mutex_unlock( &p_owner->lock );
|
|
}
|
|
|
|
static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
|
|
@@ -1961,11 +1966,10 @@
|
|
|
|
/* Parameters changed, restart the aout */
|
|
vlc_mutex_lock( &p_owner->lock );
|
|
-
|
|
- aout_DecDelete( p_owner->p_aout );
|
|
p_owner->p_aout = NULL;
|
|
-
|
|
vlc_mutex_unlock( &p_owner->lock );
|
|
+ aout_DecDelete( p_owner->p_aout );
|
|
+
|
|
input_resource_PutAout( p_owner->p_resource, p_aout );
|
|
}
|
|
|