← Back to branch summary

~ubuntu-branches/ubuntu/maverick/mpd/maverick-proposed

~ubuntu-branches/ubuntu/maverick/mpd/maverick-proposed

« back to all changes in this revision

Viewing changes to src/decoder/vorbis_plugin.c

Committer: Andrew Mitchell
Date: 2010-06-09 21:45:30 UTC
mfrom: (1.1.13 upstream)
Revision ID: ajmitch@ubuntu.com-20100609214530-9j1wdxdlmm5e52aj

Merging shared upstream rev into target branch.

files added:
src/input/rewind_input_plugin.c

src/input/rewind_input_plugin.h

files removed:
compile

files modified:
Makefile.am

Makefile.in

NEWS

aclocal.m4

config.guess

config.h.in

config.sub

configure

configure.ac

depcomp

install-sh

missing

src/aiff.c

src/archive/bz2_plugin.c

src/archive/iso_plugin.c

src/archive/zip_plugin.c

src/archive_api.h

src/cue/cue_tag.c

src/dbUtils.c

src/decoder/_flac_common.c

src/decoder/ffmpeg_plugin.c

src/decoder/flac_plugin.c

src/decoder/mad_plugin.c

src/decoder/mpcdec_plugin.c

src/decoder/oggflac_plugin.c

src/decoder/vorbis_plugin.c

src/decoder/wavpack_plugin.c

src/decoder_api.c

src/decoder_control.h

src/decoder_thread.c

src/input/archive_input_plugin.c

src/input/curl_input_plugin.c

src/input/curl_input_plugin.h

src/input/file_input_plugin.c

src/input/lastfm_input_plugin.c

src/input_stream.c

src/mapper.c

src/mapper.h

src/mixer_control.c

src/output_thread.c

src/player_thread.c

src/playlist.c

src/playlist_save.c

src/queue.c

src/riff.c

src/song_save.c

src/sticker.c

src/stored_playlist.c

src/tag.c

src/tag.h

src/tag_id3.c

src/update.c

test/run_input.c

Show diffs side-by-side

added added

removed removed

src/decoder/vorbis_plugin.c

405

405

406

406

static const char *const vorbis_mime_types[] = {

407

407

"application/ogg",

408

"application/x-ogg",

409

"audio/ogg",

410

"audio/vorbis",

411

"audio/vorbis+ogg",

412

"audio/x-ogg",

413

"audio/x-vorbis",

408

414

"audio/x-vorbis+ogg",

409

"application/x-ogg",

410

415

NULL

411

416

};

412

417

Older »