From 7706ddf611959d5ca58c47b5618f23f9b4be496a Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 7 Apr 2010 18:05:59 +0100 Subject: Add video/mp2t (and the corresponding video/mp2p). --- ChangeLog | 1 + src/demuxers/demux_mpeg_pes.c | 2 +- src/demuxers/demux_ts.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 481a11c9f..1e0fca4a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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) { -- cgit v1.2.3