diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-02-10 12:15:21 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-02-22 15:16:41 +0200 |
commit | 5177b24b25931b83adea9de6f9c578654640346c (patch) | |
tree | 11f34377e6e2abeed39744880d6b488c406ce26b /mplayer.c | |
parent | 496b09e04dabc01048c4cb92f1610f68caabd19c (diff) | |
download | mpv-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 'mplayer.c')
-rw-r--r-- | mplayer.c | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -4371,14 +4371,9 @@ if (edl_output_filename) { mpctx->stream=NULL; mpctx->demuxer=NULL; - if (mpctx->d_audio) { - //free_demuxer_stream(mpctx->d_audio); - mpctx->d_audio=NULL; - } - if (mpctx->d_video) { - //free_demuxer_stream(d_video); - mpctx->d_video=NULL; - } + mpctx->d_audio=NULL; + mpctx->d_video=NULL; + mpctx->d_sub = NULL; mpctx->sh_audio=NULL; mpctx->sh_video=NULL; |