summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-10 12:15:21 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-22 15:16:41 +0200
commit5177b24b25931b83adea9de6f9c578654640346c (patch)
tree11f34377e6e2abeed39744880d6b488c406ce26b /libmpdemux/demuxer.c
parent496b09e04dabc01048c4cb92f1610f68caabd19c (diff)
downloadmpv-5177b24b25931b83adea9de6f9c578654640346c.tar.bz2
mpv-5177b24b25931b83adea9de6f9c578654640346c.tar.xz
cleanup: demuxer.[ch]: remove unused code, make functions static
Remove some unused lines from demuxer.h. Make some demuxer.c functions static. Move new_ds_stream() declaration from demuxer.h to stream.h (the function is defined in stream.c). Clean up some code in mplayer.c that had commented-out free_demuxer_stream() calls.
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 6607f2399f..2383deb73d 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -253,13 +253,13 @@ void free_demux_packet(struct demux_packet *dp)
free(dp);
}
-void free_demuxer_stream(demux_stream_t *ds)
+static void free_demuxer_stream(struct demux_stream *ds)
{
ds_free_packs(ds);
free(ds);
}
-demux_stream_t *new_demuxer_stream(struct demuxer *demuxer, int id)
+static struct demux_stream *new_demuxer_stream(struct demuxer *demuxer, int id)
{
demux_stream_t *ds = malloc(sizeof(demux_stream_t));
*ds = (demux_stream_t){
@@ -906,7 +906,7 @@ void demuxer_help(void)
* May be NULL.
* @return DEMUXER_TYPE_xxx, -1 if error or not found
*/
-int get_demuxer_type_from_name(char *demuxer_name, int *force)
+static int get_demuxer_type_from_name(char *demuxer_name, int *force)
{
int i;
long type_int;