summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-18 11:13:58 +0200
committerwm4 <wm4@nowhere>2012-08-20 15:36:02 +0200
commit8ca3ec1562986c0681261cad407e05578eda45fd (patch)
tree0822a5c95e2b0e26ec9497e6826a98db8704dfa2 /libmpdemux/demuxer.c
parentfc2ea37694a6e508fe6ebc56711b11be592c7a8d (diff)
downloadmpv-8ca3ec1562986c0681261cad407e05578eda45fd.tar.bz2
mpv-8ca3ec1562986c0681261cad407e05578eda45fd.tar.xz
libmpdemux: remove demux_real, demux_viv, demux_audio
libavformat replaces demux_audio completely. I don't know/care what vivo (demux_viv) is. libavformat has a Real demuxer; it seems it works slightly better, with a different set of bugs.
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 51d7a45cb4..e17a4ebeff 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -58,14 +58,9 @@ extern const demuxer_desc_t demuxer_desc_tv;
extern const demuxer_desc_t demuxer_desc_mf;
extern const demuxer_desc_t demuxer_desc_avi;
extern const demuxer_desc_t demuxer_desc_asf;
-extern const demuxer_desc_t demuxer_desc_real;
extern const demuxer_desc_t demuxer_desc_matroska;
-extern const demuxer_desc_t demuxer_desc_realaudio;
-extern const demuxer_desc_t demuxer_desc_vivo;
extern const demuxer_desc_t demuxer_desc_gif;
-extern const demuxer_desc_t demuxer_desc_avs;
extern const demuxer_desc_t demuxer_desc_rawdv;
-extern const demuxer_desc_t demuxer_desc_audio;
extern const demuxer_desc_t demuxer_desc_rtp;
extern const demuxer_desc_t demuxer_desc_rtp_nemesi;
extern const demuxer_desc_t demuxer_desc_lavf;
@@ -89,14 +84,9 @@ const demuxer_desc_t *const demuxer_list[] = {
&demuxer_desc_avi,
&demuxer_desc_asf,
&demuxer_desc_matroska,
- &demuxer_desc_realaudio,
#ifdef CONFIG_GIF
&demuxer_desc_gif,
#endif
-#ifdef CONFIG_WIN32DLL
- &demuxer_desc_avs,
-#endif
- &demuxer_desc_audio,
#ifdef CONFIG_LIVE555
&demuxer_desc_rtp,
#endif