diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-04-08 16:33:35 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-04-08 16:33:35 +0100 |
| commit | 576c672a22a76a6d803da895845de47d20ec9dde (patch) | |
| tree | a7e71ac9e9b03ad8826b0fc5376c8286573f0726 /src/demuxers/demux_mpeg_pes.c | |
| parent | 17c987052ea86328f2dd27b52b3fc9518f500ad8 (diff) | |
| parent | 818165da93f72b8b32c164bcabb3eae2d4e4dc31 (diff) | |
| download | xine-lib-576c672a22a76a6d803da895845de47d20ec9dde.tar.gz xine-lib-576c672a22a76a6d803da895845de47d20ec9dde.tar.bz2 | |
Merge from 1.1.
--HG--
rename : include/xine.h.in => include/xine.h
rename : src/xine-engine/video_out.h => include/xine/video_out.h
Diffstat (limited to 'src/demuxers/demux_mpeg_pes.c')
| -rw-r--r-- | src/demuxers/demux_mpeg_pes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 3b2489a43..5ad959d51 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -1756,7 +1756,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("mpeg pes demux plugin"); this->demux_class.identifier = "MPEG_PES"; - this->demux_class.mimetypes = NULL; + this->demux_class.mimetypes = "video/mp2p: m2p: MPEG2 program stream;"; this->demux_class.extensions = "pes vdr:/ netvdr:/"; this->demux_class.dispose = default_demux_class_dispose; |