summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-03-14 23:52:45 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-03-14 23:52:45 +0200
commitae2faad6669c313b7a5dd318baeee0bffdd47031 (patch)
tree0b383b5dde56d54be4b144e7e23e96bd8bdd43cf /libmpdemux/demuxer.c
parentb93f4b7bba0e31d157b74685d3166f74a6c244d7 (diff)
parent642162c07460e439d1d81cda4643dc028ed238e0 (diff)
downloadmpv-ae2faad6669c313b7a5dd318baeee0bffdd47031.tar.bz2
mpv-ae2faad6669c313b7a5dd318baeee0bffdd47031.tar.xz
Merge svn changes up to r28951
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 6c3792b1d9..4347feee0b 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -46,7 +46,6 @@ extern const demuxer_desc_t demuxer_desc_mf;
extern const demuxer_desc_t demuxer_desc_avi;
extern const demuxer_desc_t demuxer_desc_y4m;
extern const demuxer_desc_t demuxer_desc_asf;
-extern const demuxer_desc_t demuxer_desc_nuv;
extern const demuxer_desc_t demuxer_desc_real;
extern const demuxer_desc_t demuxer_desc_smjpeg;
extern const demuxer_desc_t demuxer_desc_matroska;
@@ -101,7 +100,6 @@ const demuxer_desc_t *const demuxer_list[] = {
&demuxer_desc_y4m,
&demuxer_desc_asf,
&demuxer_desc_nsv,
- &demuxer_desc_nuv,
&demuxer_desc_real,
&demuxer_desc_smjpeg,
&demuxer_desc_matroska,