Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
9346a542
Commit
9346a542
authored
Oct 06, 2012
by
Rémi Denis-Courmont
Browse files
stream output: remove nul/unused object members
parent
04c0c091
Changes
3
Hide whitespace changes
Inline
Side-by-side
include/vlc_sout.h
View file @
9346a542
...
...
@@ -47,17 +47,11 @@ struct sout_instance_t
char
*
psz_sout
;
/* meta data (Read only) XXX it won't be set before the first packet received */
vlc_meta_t
*
p_meta
;
/** count of output that can't control the space */
int
i_out_pace_nocontrol
;
vlc_mutex_t
lock
;
sout_stream_t
*
p_stream
;
/** Private */
sout_instance_sys_t
*
p_sys
;
};
/****************************************************************************
...
...
@@ -73,10 +67,6 @@ struct sout_access_out_t
module_t
*
p_module
;
char
*
psz_access
;
int
i_writes
;
/** Local counter reset each time it is transferred to stats */
int64_t
i_sent_bytes
;
char
*
psz_path
;
sout_access_out_sys_t
*
p_sys
;
int
(
*
pf_seek
)(
sout_access_out_t
*
,
off_t
);
...
...
@@ -195,9 +185,6 @@ struct sout_stream_t
config_chain_t
*
p_cfg
;
sout_stream_t
*
p_next
;
/* Subpicture unit */
spu_t
*
p_spu
;
/* add, remove a stream */
sout_stream_id_t
*
(
*
pf_add
)(
sout_stream_t
*
,
es_format_t
*
);
int
(
*
pf_del
)(
sout_stream_t
*
,
sout_stream_id_t
*
);
...
...
modules/mux/mp4.c
View file @
9346a542
...
...
@@ -964,7 +964,6 @@ static bo_t *GetUdtaTag( sout_mux_t *p_mux )
{
sout_mux_sys_t
*
p_sys
=
p_mux
->
p_sys
;
bo_t
*
udta
=
box_new
(
"udta"
);
vlc_meta_t
*
p_meta
=
p_mux
->
p_sout
->
p_meta
;
int
i_track
;
/* Requirements */
...
...
@@ -998,8 +997,9 @@ static bo_t *GetUdtaTag( sout_mux_t *p_mux )
box_fix
(
box
);
box_gather
(
udta
,
box
);
}
#if 0
/* Misc atoms */
vlc_meta_t *p_meta = p_mux->p_sout->p_meta;
if( p_meta )
{
#define ADD_META_BOX( type, box_string ) { \
...
...
@@ -1024,7 +1024,7 @@ static bo_t *GetUdtaTag( sout_mux_t *p_mux )
ADD_META_BOX( URL, "url" );
#undef ADD_META_BOX
}
#endif
box_fix
(
udta
);
return
udta
;
}
...
...
src/stream_output/stream_output.c
View file @
9346a542
...
...
@@ -109,9 +109,7 @@ sout_instance_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest
/* *** init descriptor *** */
p_sout
->
psz_sout
=
strdup
(
psz_dest
);
p_sout
->
p_meta
=
NULL
;
p_sout
->
i_out_pace_nocontrol
=
0
;
p_sout
->
p_sys
=
NULL
;
vlc_mutex_init
(
&
p_sout
->
lock
);
p_sout
->
p_stream
=
NULL
;
...
...
@@ -145,12 +143,6 @@ void sout_DeleteInstance( sout_instance_t * p_sout )
/* *** free all string *** */
FREENULL
(
p_sout
->
psz_sout
);
/* delete meta */
if
(
p_sout
->
p_meta
)
{
vlc_meta_Delete
(
p_sout
->
p_meta
);
}
vlc_mutex_destroy
(
&
p_sout
->
lock
);
/* *** free structure *** */
...
...
@@ -269,9 +261,6 @@ sout_access_out_t *sout_AccessOutNew( vlc_object_t *p_sout,
p_access
->
pf_control
=
NULL
;
p_access
->
p_module
=
NULL
;
p_access
->
i_writes
=
0
;
p_access
->
i_sent_bytes
=
0
;
p_access
->
p_module
=
module_need
(
p_access
,
"sout access"
,
p_access
->
psz_access
,
true
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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