diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-15 03:01:07 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-15 03:01:07 +0100 |
| commit | 15eb883def371a660ee8c9e8f47edb164d0a7feb (patch) | |
| tree | 0059cc4b3af4200df7aa37c88a1550a2523a1371 /src/demuxers | |
| parent | c98a025193cd6aa8c8c8cc1cf3404b5f7b9251e1 (diff) | |
| parent | bc589d30c18a0517804c1306869e77f67d0da3ec (diff) | |
| download | xine-lib-15eb883def371a660ee8c9e8f47edb164d0a7feb.tar.gz xine-lib-15eb883def371a660ee8c9e8f47edb164d0a7feb.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : po/libxine1.pot => po/libxine2.pot
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_qt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 2c896c6ae..b5ca5c59e 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -3144,7 +3144,9 @@ static void *init_plugin (xine_t *xine, void *data) { "video/quicktime: mov,qt: Quicktime animation;" "video/x-quicktime: mov,qt: Quicktime animation;" "audio/x-m4a: m4a,m4b: MPEG-4 audio;" - "application/x-quicktimeplayer: qtl: Quicktime list;"; + "application/x-quicktimeplayer: qtl: Quicktime list;" + "video/mp4: mp4,mpg4: MPEG-4 video;" + "audio/mp4: mp4,mpg4: MPEG-4 audio;"; this->demux_class.extensions = "mov qt mp4 m4a m4b"; this->demux_class.dispose = default_demux_class_dispose; |