diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-03-20 14:25:40 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-03-20 14:25:40 +0000 |
| commit | ced4b1666765715376058ea16669d18a4f3e68e6 (patch) | |
| tree | dd8ca75cfc4f841b82f00ea7b24b849ee277577a /src/spu_dec | |
| parent | 77aa841ba7f4249dceaea6470cb025f976a6e57a (diff) | |
| parent | 5f74ef4b65a270a8b985917373bc0e219fa06ecd (diff) | |
| download | xine-lib-ced4b1666765715376058ea16669d18a4f3e68e6.tar.gz xine-lib-ced4b1666765715376058ea16669d18a4f3e68e6.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libxineadec/gsm610/Makefile.am => contrib/gsm610/Makefile.am
rename : src/libxineadec/nosefart/diff_to_nosefart_cvs.patch => contrib/nosefart/diff_to_nosefart_cvs.patch
rename : src/libxineadec/nosefart/nes6502.c => contrib/nosefart/nes6502.c
rename : src/libxineadec/nosefart/nes6502.h => contrib/nosefart/nes6502.h
rename : src/libxineadec/nosefart/nes_apu.c => contrib/nosefart/nes_apu.c
rename : src/libxineadec/nosefart/nes_apu.h => contrib/nosefart/nes_apu.h
rename : src/libxineadec/nosefart/nsf.c => contrib/nosefart/nsf.c
rename : src/libxineadec/nosefart/nsf.h => contrib/nosefart/nsf.h
rename : src/libxineadec/nosefart/types.h => contrib/nosefart/types.h
rename : src/libxineadec/nosefart/version.h => contrib/nosefart/version.h
rename : doc/faq/faq.sgml => doc/faq/faq.docbook
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
rename : src/libxinevdec/image.c => src/video_dec/image.c
Diffstat (limited to 'src/spu_dec')
| -rw-r--r-- | src/spu_dec/sputext_demuxer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/spu_dec/sputext_demuxer.c b/src/spu_dec/sputext_demuxer.c index 0b89d03c8..a8e252c30 100644 --- a/src/spu_dec/sputext_demuxer.c +++ b/src/spu_dec/sputext_demuxer.c @@ -1374,7 +1374,8 @@ static demux_plugin_t *open_demux_plugin (demux_class_t *class_gen, xine_stream_ (strncasecmp(ending, ".sub", 4) != 0) && (strncasecmp(ending, ".srt", 4) != 0) && (strncasecmp(ending, ".smi", 4) != 0) && - (strncasecmp(ending, ".ssa", 4) != 0))) { + (strncasecmp(ending, ".ssa", 4) != 0) && + (strncasecmp(ending, ".ass", 4) != 0))) { free (this); return NULL; } @@ -1431,7 +1432,7 @@ void *init_sputext_demux_class (xine_t *xine, void *data) { /* do not report this mimetype, it might confuse browsers. */ /* "text/plain: asc txt sub srt: VIDEO subtitles;" */ this->demux_class.mimetypes = NULL; - this->demux_class.extensions = "asc txt sub srt smi ssa"; + this->demux_class.extensions = "asc txt sub srt smi ssa ass"; this->demux_class.dispose = default_demux_class_dispose; /* |