git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a126c1
)
Cosmetics.
author
Laurent Aimar
<fenrir@videolan.org>
Fri, 14 Nov 2008 00:58:09 +0000
(
01:58
+0100)
committer
Laurent Aimar
<fenrir@videolan.org>
Mon, 17 Nov 2008 19:03:27 +0000
(20:03 +0100)
src/input/es_out_timeshift.c
patch
|
blob
|
history
diff --git
a/src/input/es_out_timeshift.c
b/src/input/es_out_timeshift.c
index
01232a5
..
8498c48
100644
(file)
--- a/
src/input/es_out_timeshift.c
+++ b/
src/input/es_out_timeshift.c
@@
-225,15
+225,6
@@
static void Destroy( es_out_t *p_out )
if( p_sys->b_delayed )
TsStop( p_out );
- for( ;; )
- {
- ts_cmd_t cmd;
-
- if( CmdPop( p_out, &cmd ) )
- break;
-
- CmdClean( &cmd );
- }
TAB_CLEAN( p_sys->i_cmd, p_sys->pp_cmd );
while( p_sys->i_es > 0 )
@@
-584,6
+575,16
@@
static void TsStop( es_out_t *p_out )
vlc_object_kill( p_sys->p_thread );
vlc_thread_join( p_sys->p_thread );
+ for( ;; )
+ {
+ ts_cmd_t cmd;
+
+ if( CmdPop( p_out, &cmd ) )
+ break;
+
+ CmdClean( &cmd );
+ }
+
p_sys->b_delayed = false;
}
static void *TsRun( vlc_object_t *p_thread )