Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
3389292c
Commit
3389292c
authored
Jul 22, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
access: merge access_Delete() and vlc_access_Delete()
parent
3a7fdd03
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
19 deletions
+9
-19
src/input/access.c
src/input/access.c
+7
-16
src/input/access.h
src/input/access.h
+0
-1
src/input/stream.c
src/input/stream.c
+2
-2
No files found.
src/input/access.c
View file @
3389292c
...
@@ -105,21 +105,6 @@ error:
...
@@ -105,21 +105,6 @@ error:
return
NULL
;
return
NULL
;
}
}
/*****************************************************************************
* access_Delete:
*****************************************************************************/
void
access_Delete
(
access_t
*
p_access
)
{
module_unneed
(
p_access
,
p_access
->
p_module
);
free
(
p_access
->
psz_access
);
free
(
p_access
->
psz_location
);
free
(
p_access
->
psz_filepath
);
free
(
p_access
->
psz_demux
);
vlc_object_release
(
p_access
);
}
access_t
*
vlc_access_NewMRL
(
vlc_object_t
*
parent
,
const
char
*
mrl
)
access_t
*
vlc_access_NewMRL
(
vlc_object_t
*
parent
,
const
char
*
mrl
)
{
{
char
*
buf
=
strdup
(
mrl
);
char
*
buf
=
strdup
(
mrl
);
...
@@ -138,7 +123,13 @@ access_t *vlc_access_NewMRL(vlc_object_t *parent, const char *mrl)
...
@@ -138,7 +123,13 @@ access_t *vlc_access_NewMRL(vlc_object_t *parent, const char *mrl)
void
vlc_access_Delete
(
access_t
*
access
)
void
vlc_access_Delete
(
access_t
*
access
)
{
{
access_Delete
(
access
);
module_unneed
(
access
,
access
->
p_module
);
free
(
access
->
psz_access
);
free
(
access
->
psz_location
);
free
(
access
->
psz_filepath
);
free
(
access
->
psz_demux
);
vlc_object_release
(
access
);
}
}
/*****************************************************************************
/*****************************************************************************
...
...
src/input/access.h
View file @
3389292c
...
@@ -32,7 +32,6 @@ access_t *access_New( vlc_object_t *p_obj, input_thread_t *p_input,
...
@@ -32,7 +32,6 @@ access_t *access_New( vlc_object_t *p_obj, input_thread_t *p_input,
const
char
*
psz_access
,
const
char
*
psz_demux
,
const
char
*
psz_access
,
const
char
*
psz_demux
,
const
char
*
psz_path
);
const
char
*
psz_path
);
#define access_New( a, b, c, d, e ) access_New(VLC_OBJECT(a), b, c, d, e )
#define access_New( a, b, c, d, e ) access_New(VLC_OBJECT(a), b, c, d, e )
void
access_Delete
(
access_t
*
);
char
*
get_path
(
const
char
*
location
);
char
*
get_path
(
const
char
*
location
);
...
...
src/input/stream.c
View file @
3389292c
...
@@ -385,7 +385,7 @@ error:
...
@@ -385,7 +385,7 @@ error:
}
}
free
(
s
->
p_sys
);
free
(
s
->
p_sys
);
stream_CommonDelete
(
s
);
stream_CommonDelete
(
s
);
access_Delete
(
p_access
);
vlc_
access_Delete
(
p_access
);
return
NULL
;
return
NULL
;
}
}
...
@@ -404,7 +404,7 @@ static void AStreamDestroy( stream_t *s )
...
@@ -404,7 +404,7 @@ static void AStreamDestroy( stream_t *s )
free
(
p_sys
->
p_peek
);
free
(
p_sys
->
p_peek
);
stream_CommonDelete
(
s
);
stream_CommonDelete
(
s
);
access_Delete
(
p_sys
->
p_access
);
vlc_
access_Delete
(
p_sys
->
p_access
);
free
(
p_sys
);
free
(
p_sys
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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