summaryrefslogtreecommitdiff
path: root/src/combined
AgeCommit message (Collapse)Author
2008-04-08Merge from 1.1.Darren Salt
--HG-- rename : src/xine-engine/buffer.h => include/xine/buffer.h rename : src/libmad/xine_mad_decoder.c => src/audio_dec/xine_mad_decoder.c rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c
2008-04-07Shift some audio plugin priorities: swap libreal & ffmpeg, otherwise 7 to 8.Darren Salt
2008-04-07Implement support for "MPEG-3 adu".Jinghua Luo
2008-04-07Check the Real extradata length.Darren Salt
2008-04-07Use ffmpeg's cook decoder and fix Real decoder bugsJinghua Luo
This patch drops support for RV20.
2008-04-07ffmpeg/libreal cleanupJinghua Luo
2008-04-06Merge from 1.1; adapt xine-list for 1.2.Darren Salt
--HG-- rename : debian/libxine1.install => debian/libxine2.install rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
2008-04-02Merge from 1.1.Darren Salt
--HG-- rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c
2008-04-02Add wvp to the wavpack demuxer's extensions list.Darren Salt
2008-03-31Correct the wavpack demuxer's MIME type data.Darren Salt
2008-03-12Merge from 1.1.Darren Salt
--HG-- rename : doc/faq/faq.sgml => doc/faq/faq.docbook rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
2008-03-19Fix ffmpeg plugin build where source dir != build dir.Darren Salt
2008-03-18Move ffmpeg plugin code into src/combined/ffmpeg & adapt for current ffmpeg.Darren Salt
The source remains compilable with older ffmpeg, whether internal or external. --HG-- rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c rename : src/libffmpeg/ff_mpeg_parser.c => src/combined/ffmpeg/ff_mpeg_parser.c rename : src/libffmpeg/ff_mpeg_parser.h => src/combined/ffmpeg/ff_mpeg_parser.h rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libffmpeg/ffmpeg_decoder.c => src/combined/ffmpeg/ffmpeg_decoder.c rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c
2008-03-06Fix DXR3 build with internal/new ffmpeg.Darren Salt
2008-03-04Merge from 1.1.Darren Salt
--HG-- rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h
2008-03-04Fix libavcodec/dvdata.h-related build problems with older ffmpeg.Darren Salt
2008-03-01Add extra include, dvaudio always have to use internal copy.Diego 'Flameeyes' Pettenò
2008-03-01dvdata.h is no more in include path alone.Diego 'Flameeyes' Pettenò
2008-03-01Only include the toplevel ffmpeg directory, with the new style include it ↵Diego 'Flameeyes' Pettenò
works better.
2008-03-01Merge from 1.1.Diego 'Flameeyes' Pettenò
--HG-- rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h
2008-02-29Merge from 1.1.Darren Salt
--HG-- rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c
2008-02-04Report the identifiers of unrecognised video & audio codecs.Darren Salt
2008-01-26Merge from 1.1.Darren Salt
--HG-- rename : po/libxine1.pot => po/libxine2.pot rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
2008-01-25Advertise audio/x-wavpack mime type for WavPack demuxer.Diego 'Flameeyes' Pettenò
--HG-- extra : transplant_source : iT%08m0%F6%E0%8B-%24%1F%BC%EB%24%25.%C0p%E2%14
2008-01-25Advertise proper support for FLAC files.Diego 'Flameeyes' Pettenò
application/x-flac is not reported anywhere. Both file(1) and shared-mime-info report audio/x-flac. Xiph wiki[1] reports audio/flac as being queued for registration. Report both audio/x-flac and audio/flac for compatibility. [1] http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
2008-01-17Merge from 1.1.Darren Salt
--HG-- rename : doc/faq/faq.sgml => doc/faq/faq.docbook rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c
2008-01-15Fix missing semicolon.Diego 'Flameeyes' Pettenò
2008-01-14Update demuxer for 1.2 branch to the correct extensions and mimetype ↵Diego 'Flameeyes' Pettenò
declared by Xiph.
2008-01-06Merge from 1.1.Darren Salt
--HG-- rename : src/xine-engine/buffer.h => include/xine/buffer.h rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
2008-01-02Make speex_comment_keys constant, and use character arrays rather than ↵Diego 'Flameeyes' Pettenò
literals' pointers. This increase a bit the machine code for the function, but seems to decrease the size of the plugin in general. It also will avoid a lot of relocations, and move speex_comment_keys entirely in .rodata.
2008-01-01Merge (with adjustment) from 1.1.Darren Salt
--HG-- rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am rename : include/xine.h.in => include/xine.h rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
2008-01-01Merge from 1.1.Darren Salt
--HG-- rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libmpeg2/header.c => src/video_dec/libmpeg2/header.c rename : src/libmpeg2/mpeg2_internal.h => src/video_dec/libmpeg2/mpeg2_internal.h
2007-12-28Fix another included header.Diego 'Flameeyes' Pettenò
2007-12-23Fix for os_types.h move.Diego 'Flameeyes' Pettenò
2007-12-23Mark all supported_types constant.Diego 'Flameeyes' Pettenò
2007-12-22Move libffmpeg into combined/ffmpeg directory.Diego 'Flameeyes' Pettenò
--HG-- rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c rename : src/libffmpeg/ff_mpeg_parser.c => src/combined/ffmpeg/ff_mpeg_parser.c rename : src/libffmpeg/ff_mpeg_parser.h => src/combined/ffmpeg/ff_mpeg_parser.h rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libffmpeg/ffmpeg_decoder.c => src/combined/ffmpeg/ffmpeg_decoder.c rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c
2007-12-22Merge -headers-reshuffle branch into main.Diego 'Flameeyes' Pettenò
--HG-- rename : src/xine-engine/osd.h => include/xine/osd.h
2007-12-19Use memmem to search for the Annodex string, rather than reimplementing it ↵Diego 'Flameeyes' Pettenò
by hand.
2007-12-19Mark Annodex signature and its size static and constant.Diego 'Flameeyes' Pettenò
2007-12-19Update all the code to the new headers layout.Diego 'Flameeyes' Pettenò
2007-12-18Use default_demux_plugin_dispose as dispose function.Diego 'Flameeyes' Pettenò
2007-12-15Fix wrongly-named function.Diego 'Flameeyes' Pettenò
Thanks to Petri Hintukainen for reporting.
2007-12-13Use ME_FOURCC rather than four assertions.Diego 'Flameeyes' Pettenò
2007-12-13Set stream information only when reading a streaminfo FLAC block.Diego 'Flameeyes' Pettenò
2007-12-13Use memcmp() to compare the buffer with a string rather than strncmp.Diego 'Flameeyes' Pettenò
2007-12-13Replace four-bytes comparison with a ME_FOURCC comparison.Diego 'Flameeyes' Pettenò
2007-12-11Rename METHOD_BY_EXTENSION to METHOD_BY_MRL, as it's used to identify ↵Diego 'Flameeyes' Pettenò
protocols too.
2007-12-11Remove redundant METHOD_BY_EXTENSION checks now that libxine takes care of them.Diego 'Flameeyes' Pettenò
2007-12-11Transform get_extensions and get_mimetypes into strings.Diego 'Flameeyes' Pettenò
Please note that this commit temporarily breaks building.
2007-12-11Bump the interface version for video decoder plugins.Diego 'Flameeyes' Pettenò