summaryrefslogtreecommitdiff
path: root/src/libffmpeg/Makefile.am
AgeCommit message (Collapse)Author
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-06-12A nice simple merge from 1.1.Darren Salt
Hopefully, I've applied all of the $(LTLIBINTL) changes correctly...
2007-06-09Add $(LTLIBINTL) wherever objdump -R shows a dependency on gettext functions.Darren Salt
Some plugins may have been missed due to them not being built here.
2007-05-12More configure/Makefile cleanupsMatt Messier
-- Make a pass at cleaning up contrib/ Makefile.am files -- Rename many AM_CONDITIONALS for consistency and give them better names to better indicate what they mean -- Remove some dead input plugin tests -- Clean up AM_PATH_DVDNAV
2007-05-08RIP: AC_OPTIMIZATIONSMatt Messier
-- Removed m4/optimizations.m4, and along with it, AC_OPTIMIZATIONS. -- Stripped down, cleaned up, and merged the former together with other compiler characteristic checks. -- Do not set any optimization flags into CFLAGS. Update all Makefile.am's with proper AM_CFLAGS, AM_CPPFLAGS, AM_LDFLAGS, etc. to set up optimization flags, usually from DEFAULT_OCFLAGS. -- Start cleaning up CFLAGS/CPPFLAGS stuff in Makefile.am's all over the place. -- Correct a number of places where CFLAGS itself was being mangled in Makefile to on-the-fly adjust optimizations to work around compiler bugs. This stuff is now done correctly. -- The run of automake from autogen.sh is now clean of warnings. -- Cleaned out some (now) dead macros from m4/_xine.m4 -- Mac OS X intel builds out-of-the-box now -- dropped optimization on post/deinterlace/plugins/kdetv-greedyh to O1_CFLAGS. -- OBJCFLAGS is now getting set correctly everywhere that it needs to be -- Various other miscellaneous cleanups all over
2007-04-16Fix ffmpeg_config.h build, so that make distchecks works.Diego 'Flameeyes' Pettenò
2007-04-15Only declare ffmpeg_config.h as built source when using internal FFmpeg.Diego 'Flameeyes' Pettenò
2007-04-14The other half of the dependencies fix.Darren Salt
2007-04-14Fix dependencies so that ffmpeg_config.h is built before trying to build ↵Diego 'Flameeyes' Pettenò
xineplug_decode_ff.la/
2007-04-09Check for include files in the included libavcodec directory.Diego 'Flameeyes' Pettenò
The dvdata.h is never installed by FFmpeg, so when using the external copy you have to still use the internal dvdata.h file at the moment.
2007-04-09Use ffmpeg_config.h only when using internal FFmpeg.Diego 'Flameeyes' Pettenò
This way there's no need to fake it when using the external copy.
2007-04-07Declare ffmpeg_config.h part of sources for the decode plugin.Diego 'Flameeyes' Pettenò
2007-04-07ffmpeg_config.h is no more generated by (xine-lib's) configure, so copy it ↵Diego 'Flameeyes' Pettenò
from the FFmpeg's build directory (as it's not easy to take it with relative path).
2007-04-07Remove diff_to_ffmpeg_cvs.txt file from EXTRA_DIST, as if we'll still need ↵Diego 'Flameeyes' Pettenò
it, we should put it in contrib/ instead.
2007-04-04Merge with main repository.Diego 'Flameeyes' Pettenò
--HG-- rename : src/libffmpeg/dvaudio_decoder.c => src/libffmpeg/ff_dvaudio_decoder.c rename : src/libffmpeg/video_decoder.c => src/libffmpeg/ff_video_decoder.c rename : src/libffmpeg/xine_decoder.h => src/libffmpeg/ffmpeg_decoder.h rename : src/libffmpeg/xine_encoder.c => src/libffmpeg/ffmpeg_encoder.c
2007-04-04Fix xine_encoder.c presence in EXTRA_DIST.Diego 'Flameeyes' Pettenò
2007-04-04Rename FFmpeg plugins' sources so that there are no conflicts with other ↵Diego 'Flameeyes' Pettenò
source files. This way when you get a backtrace, video_decoder.c is never the FFmpeg one. --HG-- rename : src/libffmpeg/audio_decoder.c => src/libffmpeg/ff_audio_decoder.c rename : src/libffmpeg/dvaudio_decoder.c => src/libffmpeg/ff_dvaudio_decoder.c rename : src/libffmpeg/mpeg_parser.c => src/libffmpeg/ff_mpeg_parser.c rename : src/libffmpeg/mpeg_parser.h => src/libffmpeg/ff_mpeg_parser.h rename : src/libffmpeg/video_decoder.c => src/libffmpeg/ff_video_decoder.c rename : src/libffmpeg/xine_decoder.c => src/libffmpeg/ffmpeg_decoder.c rename : src/libffmpeg/xine_decoder.h => src/libffmpeg/ffmpeg_decoder.h rename : src/libffmpeg/xine_encoder.c => src/libffmpeg/ffmpeg_encoder.c
2007-04-03Support the new makefile style for FFmpeg building.Diego 'Flameeyes' Pettenò
2007-04-03Merge changes happened in 1.1 development.Diego 'Flameeyes' Pettenò
2007-03-22Fix crosscompile to use build and host definition from autoconf, rather than ↵Diego 'Flameeyes' Pettenò
using hacksaround. Also replace the whole pthread check with an improved macro originally written for XCB, this way it's not going to try linking the fake -lpthread on Darwin, and it also does not force a -I/usr/local/include on FreeBSD. The new macro respects the same variables set by ports, so that it's even more transparent to FreeBSD users. CVS patchset: 8739 CVS date: 2007/03/22 20:44:58
2007-01-14Remove ffmpeg_config.h on "make distclean".Darren Salt
CVS patchset: 8509 CVS date: 2007/01/14 17:16:14
2006-12-02Start working on a branch where FFmpeg is not copied, patched and carved to ↵Diego 'Flameeyes' Pettenò
be built with automake but instead imported inline and built using its own build system. This is an import of a slightly modified FFmpeg current tree. xine-lib builds, install and run fine with it, but there are of course plenty of things that needs to be fixed before it can even be considered for a 1.2.x series. Work will continue in the next days of course. CVS patchset: 8397 CVS date: 2006/12/02 01:19:48
2006-09-12Rewrite external ffmpeg support by using pkg-config rather than ad-hoc ↵Diego 'Flameeyes' Pettenò
tests. To change the prefix, simply change the variables from outside or add the directory containing the .pc files to PKG_CONFIG_PATH environment variable. CVS patchset: 8222 CVS date: 2006/09/12 00:06:05
2006-07-10Implement visibility support, available on GCC 4.0 and later and on some 3.4 ↵Diego 'Flameeyes' Pettenò
(through backports), to avoid exporting unneeded internal symbols, making plugins' loading faster and use of internal copies of libraries more solid. It should automatically fall back to the old way in GCCs that does not support -fvisibility=hidden, but has to be tested carefully. No issues were found in the months of testing in Gentoo, but this requires special attention anyway. CVS patchset: 8101 CVS date: 2006/07/10 22:08:12
2006-06-19Mark text as impure where necessary to fix build under Solaris/IA32.Robin KAY
CVS patchset: 8060 CVS date: 2006/06/19 12:08:45
2006-03-28ffmpeg automagic improvements:František Dvořák
- support FreeBSD port of external ffmpeg (but there is too old version now anyway) - differs postproc and avcodec, use both in Makefile (fixes bug seen in Gentoo) little fix in optimize automagic: - properly use '$' in automagic macros CVS patchset: 7955 CVS date: 2006/03/28 14:27:48
2005-10-31Build for builddir != srcdir.František Dvořák
CVS patchset: 7790 CVS date: 2005/10/31 11:54:21
2005-10-23big ffmpeg updateMiguel Freitas
it is likely to break, so please keep both pieces CVS patchset: 7767 CVS date: 2005/10/23 02:11:16
2005-09-05*BUGFIX*František Dvořák
Build improvements and WIN32 port updates: - add --with-pthread-pefix and --with-zlib-pefix options - prepare for removing internal zlib and pthreads-win32 relics, updated documentation for possible WIN32 developers (only for me? :->) - fixed bug in unimportant part of configure.ac for MinGW due to xine paths - fixed my bug in cdda (but it compiled fine anyway) - fixed unimportant bug in planar Makefile.am - next MSVC update due to external zlib, pthreads and latest changes, removed relic includes - checked distcheck CVS patchset: 7719 CVS date: 2005/09/05 17:02:56
2005-08-25*BUGFIX*František Dvořák
Windows ports fixes and improvements due to my current work on toxine: - first experiments with external win32 pthreads, more portable code (pthread_t may be a struct) - headers refactored - moved dirent win32 replacement to lib/, hide it for frontends, used system version, if found, not used non-POSIX dirent->d_reclen (this item doesn't work in MinGW), fix memleak in dvb - separated settings for postproc and avcodec when using external ffmpeg - check for malloc.h in public xine.m4, used it conditionally in xine headers - replaced random() by POSIX more common rand() - prevent one segfault in directx vo plugin, if fails - M$VC port update CVS patchset: 7709 CVS date: 2005/08/25 15:36:29
2004-08-27MINGW32 port. Engine library and most of plugins compiles now.František Dvořák
List of some changes: - replaced some _MSC_VER by more common WIN32 - define INTLDIR, remove -static flag for included intl - shared more common CFLAGS with DEBUG_CFLAGS - use WIN32_CFLAGS for all building - separate some flags into THREAD_CFLAGS_CONFIG, THREAD_CFLAGS_CONFIG and ZLIB_LIB_CONFIG for public xine-config, automatically use internal libs if necessary - don't warn about missing X for mingw and cygwin - libw32dll disabled for WIN32 (making native loader would be interesting, or porting wine code to Windows? :->) - DVB and RTP disabled for WIN32, not ported yet - fix build and fix a warning in cdda - fix build for nosefart and libfaad - implement configure option --disable-freetype - sync libxine.pc and xine-config.in - add -liberty to goom under WIN32 - move original build files from included phread and zlib into archives and replace them by autotools CVS patchset: 6910 CVS date: 2004/08/27 19:33:17
2004-08-16change CFLAGS to CPPFLAGSMichael Roitzsch
CVS patchset: 6887 CVS date: 2004/08/16 15:28:25
2004-08-02Compile fix when using internal ffmpeg libraryAndre Pang
CVS patchset: 6867 CVS date: 2004/08/02 07:53:52
2004-07-31New configure option --with-external-ffmpeg[=PREFIX].František Dvořák
CVS patchset: 6865 CVS date: 2004/07/31 18:57:45
2004-07-18One more time.Thibaut Mattern
CVS patchset: 6809 CVS date: 2004/07/18 15:34:57
2004-07-18Argl, i always forget something. :<Thibaut Mattern
CVS patchset: 6808 CVS date: 2004/07/18 15:31:29
2004-03-16By popular request, dv audio decodingJames Stembridge
CVS patchset: 6280 CVS date: 2004/03/16 23:31:30
2004-02-29Various compilation fixes and updates:František Dvořák
- xine compilable without iconv (scream if I something broke) - update MSVC port, fixes in avi demux - add iff.h into makefiles - ffmpeg depends on zlib (build was OK only when freetype was installed) - commit a patch for goom CVS patchset: 6192 CVS date: 2004/02/29 17:26:45
2004-01-31Split ffmpeg interface into audio and video specific filesJames Stembridge
CVS patchset: 6087 CVS date: 2004/01/31 01:19:17
2003-11-19explicitly link math lib.Daniel Caujolle-Bert
CVS patchset: 5766 CVS date: 2003/11/19 22:58:55
2003-11-01big ffmpeg patchMichael Roitzsch
* do not define CONFIG_ENCODERS any more, use a stripped down XINE_MPEG_ENCODER, which will only compile an I-frame-only MPEG1 encoder (speeds up compile time) * fix a lot of warnings in ffmpeg (a good deal of which have already been submitted to the ffmpeg project by Mike) * simplify some Makefiles CVS patchset: 5667 CVS date: 2003/11/01 18:12:53
2003-11-01Not link ffmpeg plugin with XvMC.František Dvořák
CVS patchset: 5663 CVS date: 2003/11/01 13:43:41
2003-10-31And now really the fix. :-)František Dvořák
CVS patchset: 5656 CVS date: 2003/10/31 22:14:32
2003-10-31Fix the unresolved symbol in ffmpeg configured on systems with XVMC.František Dvořák
Increase verbosity level in error messages of loading plugins. CVS patchset: 5655 CVS date: 2003/10/31 22:08:36
2003-10-20Allow lazy loading of Sun mediaLib. Update ChangeLog.Robin KAY
CVS patchset: 5553 CVS date: 2003/10/20 00:33:28
2003-09-26xine_encoder includes a dxr3 header, which in turn uses X11 headers,Michael Roitzsch
so we need to add $(X_CFLAGS) here CVS patchset: 5417 CVS date: 2003/09/26 16:39:56
2003-08-02stupid typo in Makefile.am...xine_1-rc0a-release1-rc0aSiggi Langauf
debian changes for q-rc0a CVS patchset: 5232 CVS date: 2003/08/02 13:41:44
2003-08-02include missing file (1-rc0a release)Siggi Langauf
CVS patchset: 5230 CVS date: 2003/08/02 11:43:51
2003-05-28video_out_dxr3.h includes other stuff from the src/dxr3 directory, so thereMichael Roitzsch
should be an include path pointing there CVS patchset: 4975 CVS date: 2003/05/28 13:53:03
2003-05-28Disable ffmpeg's encoder when HAVE_DXR3 is not defined. Remove dxr3 build hack.Robin KAY
CVS patchset: 4964 CVS date: 2003/05/28 01:52:19
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 07:22:27 +0000