diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-09-23 18:19:29 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-09-23 18:19:29 +0100 |
| commit | 81e0d9f0ddaa5465cf8f9ec5ca2aad7df8d3b4ab (patch) | |
| tree | f6c25b308dfd61acb8e5cd687a68f2f580d28ec6 /src/demuxers | |
| parent | 486fe1fc46d5f5a87696488184de7b7a5a9cb857 (diff) | |
| parent | 4100ae40f29ee52181e927a8976b04614f6e1620 (diff) | |
| download | xine-lib-81e0d9f0ddaa5465cf8f9ec5ca2aad7df8d3b4ab.tar.gz xine-lib-81e0d9f0ddaa5465cf8f9ec5ca2aad7df8d3b4ab.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_asf.c | 4 | ||||
| -rw-r--r-- | src/demuxers/demux_qt.c | 6 | ||||
| -rw-r--r-- | src/demuxers/id3.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index f125e9973..186caa2fe 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -1961,7 +1961,7 @@ static int demux_asf_seek (demux_plugin_t *this_gen, start_pos -= this->packet_size; } if (state != 5) { - xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: demux_asf_seek: begining of the stream\n"); + xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: demux_asf_seek: beginning of the stream\n"); this->input->seek (this->input, this->first_packet_pos, SEEK_SET); this->keyframe_found = 1; } else { @@ -2079,7 +2079,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, default: xprintf (stream->xine, XINE_VERBOSITY_DEBUG, - "demux_asf: warning, unkown method %d\n", stream->content_detection_method); + "demux_asf: warning, unknown method %d\n", stream->content_detection_method); return NULL; } diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 9ba70ebbb..c944e3c9e 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -3174,9 +3174,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;" - "video/mp4: mp4,mpg4: MPEG-4 video;" - "audio/mp4: mp4,mpg4: MPEG-4 audio;"; - this->demux_class.extensions = "mov qt mp4 m4a m4b"; + "video/mp4: f4v,mp4,mpg4: MPEG-4 video;" + "audio/mp4: f4a,mp4,mpg4: MPEG-4 audio;"; + this->demux_class.extensions = "mov qt mp4 m4a m4b f4a f4v"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c index ea28f5666..2b433f515 100644 --- a/src/demuxers/id3.c +++ b/src/demuxers/id3.c @@ -60,7 +60,7 @@ static const char* const id3_genre[] = "Darkwave", "Techno-Industrial", "Electronic", "Pop-Folk", "Eurodance", "Dream", "Southern Rock", "Comedy", "Cult", "Gangsta", "Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native American", - "Cabaret", "New Wave", "Psychadelic", "Rave", "Showtunes", + "Cabaret", "New Wave", "Psychedelic", "Rave", "Showtunes", "Trailer", "Lo-Fi", "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical", "Rock & Roll", "Hard Rock", "Folk", "Folk-Rock", "National Folk", "Swing", "Fast Fusion", |