diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-02 18:02:05 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-02 18:02:05 +0200 |
| commit | e62517ef6a8d23cd78325a9661f8865bd222e004 (patch) | |
| tree | 76b7a0af867236c2989ceca1cffcae541ceda9c5 /libmpdemux/demuxer.c | |
| parent | 62dda60800a902fdaf9b0ec63d8488aaa48c485f (diff) | |
| parent | 27b167bb75b908541563bab964e97b06d621f837 (diff) | |
| download | mpv-e62517ef6a8d23cd78325a9661f8865bd222e004.tar.bz2 mpv-e62517ef6a8d23cd78325a9661f8865bd222e004.tar.xz | |
Merge svn changes up to r28065
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 05225d31b6..87c2429402 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -81,6 +81,7 @@ extern const demuxer_desc_t demuxer_desc_lavf; extern const demuxer_desc_t demuxer_desc_lavf_preferred; extern const demuxer_desc_t demuxer_desc_aac; extern const demuxer_desc_t demuxer_desc_nut; +extern const demuxer_desc_t demuxer_desc_mng; /* Please do not add any new demuxers here. If you want to implement a new * demuxer, add it to libavformat, except for wrappers around external @@ -153,6 +154,9 @@ const demuxer_desc_t *const demuxer_list[] = { #ifdef CONFIG_XMMS &demuxer_desc_xmms, #endif +#ifdef CONFIG_MNG + &demuxer_desc_mng, +#endif /* Please do not add any new demuxers here. If you want to implement a new * demuxer, add it to libavformat, except for wrappers around external * libraries and demuxers requiring binary support. */ |