diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:17:33 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:17:33 +0100 |
| commit | 813c609ea30c3201eec34d4bba185566ad48c998 (patch) | |
| tree | f93ff7fd2604bf9396d5f1712d3eaa2f6d044178 /src/combined/flac_demuxer.c | |
| parent | e728b8f587ee41ff483e46fe50a4cb538c5df9e2 (diff) | |
| parent | a1508e2f58d2c4b32d032d798f6f137262717e7f (diff) | |
| download | xine-lib-813c609ea30c3201eec34d4bba185566ad48c998.tar.gz xine-lib-813c609ea30c3201eec34d4bba185566ad48c998.tar.bz2 | |
Merge from 1.2 tip.
--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c
Diffstat (limited to 'src/combined/flac_demuxer.c')
| -rw-r--r-- | src/combined/flac_demuxer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c index bab42876c..22ee2319b 100644 --- a/src/combined/flac_demuxer.c +++ b/src/combined/flac_demuxer.c @@ -713,7 +713,8 @@ demux_flac_init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("FLAC demux plugin"); this->demux_class.identifier = "FLAC"; - this->demux_class.mimetypes = "application/x-flac: flac: FLAC Audio;"; + this->demux_class.mimetypes = "application/x-flac: flac: FLAC Audio;" + "application/flac: flac: FLAC Audio;"; this->demux_class.extensions = "flac"; this->demux_class.dispose = default_demux_class_dispose; |