diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-04-07 18:05:59 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-04-07 18:05:59 +0100 |
| commit | 7706ddf611959d5ca58c47b5618f23f9b4be496a (patch) | |
| tree | e87c9439cf4c1c10e8a6a6da85309dbaa9ec39b6 | |
| parent | 5b81ecf4ccf8e5609ae19d2229c96ba0765b9a28 (diff) | |
| download | xine-lib-7706ddf611959d5ca58c47b5618f23f9b4be496a.tar.gz xine-lib-7706ddf611959d5ca58c47b5618f23f9b4be496a.tar.bz2 | |
Add video/mp2t (and the corresponding video/mp2p).
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/demuxers/demux_mpeg_pes.c | 2 | ||||
| -rw-r--r-- | src/demuxers/demux_ts.c | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -4,6 +4,7 @@ xine-lib (1.1.19) 2010-??-?? * Fix V4L2 check. * Add support for Ogg tag 'DISCNUMBER' and ID3 tag 'TPOS'. * Add support for EAC3. + * Recognise video/mp2t and video/mp2p. xine-lib (1.1.18.1) 2010-03-06 * Oops. compat.c (for DXR3 support) was omitted. diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 0fe97fb93..b2d0f2fa9 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -1771,7 +1771,7 @@ static const char *get_extensions (demux_class_t *this_gen) { } static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; + return "video/mp2p: m2p: MPEG2 program stream;"; } static void class_dispose (demux_class_t *this_gen) { diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 1a19340f3..b55877c83 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -2489,7 +2489,7 @@ static const char *get_extensions (demux_class_t *this_gen) { } static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; + return "video/mp2t: m2t: MPEG2 transport stream;"; } static void class_dispose (demux_class_t *this_gen) { |