summaryrefslogtreecommitdiff
path: root/src/combined/ffmpeg
AgeCommit message (Collapse)Author
2008-04-07ffmpeg/libreal cleanupJinghua Luo
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-01Remove stray #if and #endif.Diego 'Flameeyes' Pettenò
2008-03-01Merge from 1.2 tip.Diego 'Flameeyes' Pettenò
--HG-- rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c
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-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-05Now that FFmpeg is always used external, move the ffmpeg-based MPEG encoderDiego 'Flameeyes' Pettenò
out of the FFmpeg decoding plugin and directly inside dxr3 plugin. This way there is no dlopen() required to open the plugin to read the init function from, there is no need for wrapper init/close functions, and the dxr3_encoder_init() function is no more exported by the plugin. --HG-- rename : src/combined/ffmpeg/ffmpeg_encoder.c => src/dxr3/ffmpeg_encoder.c
2008-01-05Move the dvaudio decoder into audio_dec.Diego 'Flameeyes' Pettenò
It only used the data table from FFmpeg, which are not public anyway. --HG-- rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c rename : src/combined/ffmpeg/ff_dvdata.h => src/audio_dec/ff_dvdata.h
2008-01-05Merge from 1.2.Diego 'Flameeyes' Pettenò
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-23Mark all supported_types constant.Diego 'Flameeyes' Pettenò
2007-12-23Merge from 1.2 main branch.Diego 'Flameeyes' Pettenò
--HG-- rename : src/xine-utils/xineutils.h => include/xine/xineutils.h rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am rename : src/libxineadec/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c 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_dvdata.h => src/combined/ffmpeg/ff_dvdata.h rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am rename : src/libmpeg2/decode.c => src/video_dec/libmpeg2/decode.c
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