Commit Graph

1002 Commits

Author SHA1 Message Date
reimar 5830140582 Add preliminary support for streaming via FFmpeg's URProtocol functions.
Basic playback tested for file and http protocols.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29923 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-17 16:09:17 +00:00
Uoti Urpala 287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
cehoyos 2a5611473c Remove CONFIG_TV_TELETEXT.
DVB teletext support is nearly finished, it will be possible to read
teletext from file, it will not be depending on reception any more.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 16:40:42 +00:00
Uoti Urpala 8bbb79c03a av_log callback handling overhaul
Move av_log callback handling from vd_ffmpeg.c to a new file
av_log.c and install the callback immediately when starting the
program. Main functionality improvements of the new code:

 - The old version only installed the callback when opening an FFmpeg
   video decoder. If nothing had triggered that then av_log() messages
   from other sources (libavformat, audio decoding, swscale usage)
   bypassed MPlayer's output system completely. Now the callback is
   always installed.

 - Current av_log message severity levels are handled correctly. The
   old code used MSGL_ERR for some messages that should be MSGL_V.

 - Message type is now set for libavformat contexts
   (MSGT_DEMUXER / MSGT_MUXER).

 - The old code did "mp_msg_test(type, mp_level)" before actually
   determining the type, so that it always used MSGT_FIXME. This led
   to some messages being incorrectly dropped in case the user
   had specified module-specific verbosity levels. The old check in
   question was originally motivated by performance problems when
   there were a lot of callbacks; however it's not clear whether the
   part about it skipping the type determination was intentional (most
   of the performance problems must have come from the way the
   original code used snprintf) and in my tests current FFmpeg
   libraries have not generated unreasonable amounts of callbacks
   anyway.
2009-10-31 23:59:16 +02:00
cehoyos a9474b0b39 Move teletext specific code from stream into libmpcodecs.
Patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-29 22:13:04 +00:00
diego fc1b468117 Get rid of COMMON_LDFLAGS variable. It was a pointless indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29784 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-19 09:56:18 +00:00
diego da278b3184 Merge rules for building mencoder and mplayer.
Just the dependencies are different, so specify them separately.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29779 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-18 18:44:51 +00:00
diego 47f0629f1a Get rid of LDFLAGS_MPLAYER and LDFLAGS_MENCODER variables.
They are only used in one place so the indirection is pointless.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29778 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-18 18:41:35 +00:00
Uoti Urpala 0e1b7765be Merge svn changes up to r29644 2009-09-04 19:49:35 +03:00
reimar fde99e3c5d Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
keycodes instead of its own switch-case in vo_corevideo.m


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29575 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 13:29:07 +00:00
reimar 0dadcc7bf0 Add osx_common.c and move the keycode conversion (OSX to MPlayer) there.
Also get rid of our own defines for the keycodes and instead use the
predefined ones from Carbon.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29573 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 12:54:33 +00:00
Uoti Urpala 152e480397 vf_uspp: Mark as depending on avcodec API only, not internals
There has been some confusion about whether this filter depends on
libavcodec internals or not. When originally added it included
explicit code to support building with a shared library avcodec, but
it also used the internal dsputil.h header. Later it was marked as
depending on libavcodec internals, then the dsputil.h include was
removed as unnecessary. It seems to build fine without any internal
headers now and has no obvious other usage of internal symbols either,
so I'm enabling the build whenever libavcodec is available.
2009-07-26 20:22:48 +03:00
Uoti Urpala a92a43b91f build: Readd support for code depending on FFmpeg internals
Add configure option --ffmpeg-source-dir=PATH. If the user specifies
this option then building code that depends on FFmpeg internals is
enabled and the files files which use internal lavf headers will get
them from this path. The FFmpeg libraries linked with must export
needed internal symbols.
2009-07-26 20:22:48 +03:00
Uoti Urpala 78ea550f0f build: Remove code for internal FFmpeg build
Remove some now unnecessary parts that were used for the internal
FFmpeg build, mainly configure tests for FFmpeg features and Makefile
logic for building it.
2009-07-26 20:22:48 +03:00
Uoti Urpala 546c3fb53c Remove internal libass tree
Remove the libass/ directory and use the newest standalone version of
the library instead.
2009-07-26 20:22:43 +03:00
Uoti Urpala cd4e8dc1fa Disable functionality requiring libswscale internals
The following are affected: vo_yuv4mpeg, vf_halfpack, vf_palette,
vf_rgb2bgr, vf_yuy2, vo_mga, vo_xmga. In vo_yuv4mpeg, only disable
RGB support (which is probably little used). Others are disabled
completely for now.

vo_mga and vo_xmga are disabled by preventing configure from enabling
them. The rest is placed under LIBSWSCALE_INTERNALS variable which
isn't currently enabled anywhere.
2009-07-26 06:16:52 +03:00
Uoti Urpala fdb2f3c8ab Merge svn changes up to r29417 2009-07-12 15:52:00 +03:00
Anton Khirnov 87366694d8 Remove the internal GUI
The GUI is badly designed and too closely coupled to the internal
details of other code. The GUI code is in bad shape and unmaintained
for years. There is no indication that anyone would maintain it in the
future either. Even if someone did volunteer to implement a better
integrated GUI having the current code in the tree probably wouldn't
help much. So get rid of it.
2009-07-07 21:49:42 +03:00
lorenm 88fc4806b9 new debanding filter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29413 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-07 02:01:36 +00:00
Uoti Urpala a2037a2eff Merge svn changes up to r29412 2009-07-07 02:56:01 +03:00
Uoti Urpala 6d908205fb Merge svn changes up to r29304 2009-07-07 02:07:11 +03:00
diego 53d273ec22 Rename LIBVORBIS Makefile variable to VORBIS.
The latter is more clear as it can represent either Tremor or libvorbis.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29365 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-14 21:09:35 +00:00
diego ebf2f1d669 cosmetics: alphabetically sort SRCS_MPLAYER
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29318 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-21 08:46:24 +00:00
diego 83058ab95b Add missing path to find invocation for tags/TAGS creation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29310 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-15 23:17:25 +00:00
diego 76c0f7b271 Simplify find invocation in tags/TAGS generation command:
- Drop '-print', which is the default for find.
- Drop unnecessary invocation of find in a subshell.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29309 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-15 22:24:12 +00:00
diego e2a6bb7b41 Make sure that -I flags for internal library copies come before other CFLAGS
so that header files do not conflict with system-installed versions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29303 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 18:09:53 +00:00
diego 8ef6c14e0d libdvdread4 does not use HAVE_CONFIG_H, so drop the -D flag for libdvdread4.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29301 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 08:21:53 +00:00
Uoti Urpala 1db1773ec2 Merge svn changes up to r29277 2009-05-08 23:50:26 +03:00
diego 27bc918ffe Rename macosx video output driver to corevideo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29252 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 16:55:05 +00:00
diego e3ec5b1fd3 Rename macosx audio output driver to coreaudio.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29251 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 14:53:47 +00:00
diego 30c70cab76 Move non-conditional SRCS lists below the conditional parts. This allows
simplifying the addition of the conditional parts to the SRCS lists.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29208 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 14:02:40 +00:00
diego 7e7abb386b whitespace cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29207 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 13:52:14 +00:00
diego 40ea07ea42 Use temporary variables to add objects that depend on more than one
condition to conditionally compiled parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29206 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 13:51:47 +00:00
diego a12ecf35b2 Only add existing files to the FFMPEGFILES variable.
based on a patch by Carl Fürstenberg, azatoth gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29204 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 03:39:44 +00:00
diego 2ff2081e06 Use ADDSUFFIXES function to simplify version.h dependency declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29203 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 00:19:39 +00:00
diego 1ec5ec1fa1 Introduce ADDSUFFIXES function and use it to simplify the
ADD_ALL_DIRS and ADD_ALL_EXESUFS functions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29202 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 00:18:59 +00:00
diego 8f0639d4cc cosmetics: Move ADD_ALL_* functions to a more sensible place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29201 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 00:16:53 +00:00
diego 2bed79b908 whitespace cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29197 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-19 15:54:48 +00:00
diego a16fc43c34 cosmetics: Rename PARTS variable to FFMPEGPARTS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29196 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-19 15:54:16 +00:00
diego bf2a47d871 Introduce ADD_ALL_DIRS function to factorize clean and distclean target commands
to remove certain patterns in all subdirectories.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29195 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-19 15:51:06 +00:00
diego dc161a651e Convert another forgotten ADD_ALL_EXESUFS call.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29194 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-19 15:22:27 +00:00
diego cc07989738 Extend ADD_ALL_EXESUFS to work with a list of files instead of a single one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29193 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-19 15:16:04 +00:00
diego 3f123a9664 Remove duplicate entry from DIRS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29192 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-19 14:54:44 +00:00
diego d5f4f0856c Add files in all library subdirectories to FFMPEGFILES variable, not
just the ones below libavcodec.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29191 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-19 14:53:41 +00:00
Uoti Urpala 0e8c38c19b Merge svn changes up to r29154
Synchronizes runtime CPU detection handling in the build system with
latest FFmpeg.
2009-04-09 02:38:37 +03:00
diego 94959cc333 Specify precise dependencies for generated header file codecs.conf.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29153 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-08 18:25:23 +00:00
cehoyos 51623a5995 Reduce compilation time after version.h was updated.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29152 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-08 16:13:51 +00:00
Uoti Urpala 6dd56815b4 Merge svn changes up to r29150 2009-04-08 02:46:32 +03:00
Uoti Urpala 53eeb0e412 Merge branch 'ordered_chapters' 2009-04-08 02:43:44 +03:00
diego 5815029bd2 Add rules to install gmplayer manual pages.
based on a patch by Reinhard Tartler, siretart tauware de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29150 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-06 14:06:53 +00:00
Uoti Urpala d136cf6882 Merge svn changes up to r29134 2009-04-02 23:55:13 +03:00
bircoph e3b6f71b2d Add libbs2b audio filter itself.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29132 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 19:01:57 +00:00
diego 77416e41cf Add recently added FFmpeg subdirs to DIRS variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29125 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 08:42:16 +00:00
Uoti Urpala 58497380e5 Initial ordered chapters support
Add basic support for Matroska ordered chapters. The switching between
segments is implemented as a general edit timeline that could also be
used for other purposes.

Some things still need improvement. In particular the current code
does not try to do any proper mapping between audio/video/subtitle
streams of different files and there should be options for better
control of how MPlayer searches other files for the required content.
2009-04-02 06:51:25 +03:00
diego 1888de07f7 Do not use full CFLAGS to build codec-cfg, they are unnecessary.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29041 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-23 22:42:53 +00:00
Uoti Urpala ae2faad666 Merge svn changes up to r28951 2009-03-14 23:52:45 +02:00
diego 366c3fa13d KVA vo driver for OS/2, patch by KO Myung-Hun, komh chollian net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28950 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-14 18:44:58 +00:00
diego 36910ebe97 Only compile fastmemcpybench on x86.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28945 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-14 15:56:16 +00:00
diego 143a63fd9e Fix and restructure fastmemcpybench. It is now one binary that runs all
available memcpy variants and prints benchmark results about them.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28929 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-10 10:05:09 +00:00
reimar 601d694829 Remove native nuv demuxer, it only needs more code to achieve the same thing
as the libavformat demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28907 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 13:11:37 +00:00
reimar 591ce556b7 Make fastmemcpybench almost working - only thing missing is a way to
override HAVE_MMX etc. from config.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28906 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 12:59:14 +00:00
diego 15b605c690 Fix fastmemcpybench tools build:
- HAVE_MMX and friends now have 0/1 values and are always defined.
- Use proper file dependencies instead of a phony target.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28899 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 00:48:03 +00:00
michael 1f61255588 Add test for C memcpy()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28894 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 15:56:20 +00:00
reimar e9f1f090e8 rtjpegn.c is only needed by the NuppelVideo encoder, change Makefile accordingly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28889 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:56:35 +00:00
reimar 276a73e2f2 Remove internal NuppelVideo decoder, the code in libavcodec can decode
those files and some more and is far more maintainable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28888 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:32:42 +00:00
Uoti Urpala e0172b96e3 Merge svn changes up to r28862 2009-03-07 01:04:41 +02:00
diego 1005952a8b Only add -Ilibdvdnav to the CFLAGS of the files that require it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28829 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-05 22:19:47 +00:00
diego 3e40788623 Simplify CFLAGS generation for individual targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28827 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-05 21:27:05 +00:00
diego 95dac90527 Simplify some vidix dhahelper build commands with automatic make variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28815 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-05 20:25:54 +00:00
diego 23599b030c DART audio output driver for OS/2 by KO Myung-Hun, komh chollian net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 11:36:39 +00:00
diego c003bcdcab Fix 10l typo in ADD_ALL_EXESUFS function name.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28772 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 11:22:31 +00:00
diego e96ebebaf0 codec-cfg does not depend on codecs.conf.h, it is used to generate it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28771 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 11:07:05 +00:00
diego 3c3495a122 Make all object files depend on generated header files.
This solution does not record precise dependencies but is robust
against header dependency changes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28770 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 11:03:18 +00:00
diego 48d2eb7209 Add explicit dependencies on generated header files for the object files along
with the dependency information files. This fixes a straight build without
generating dependency information.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28769 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 10:53:37 +00:00
diego b63817b215 Fix dependencies on generated header files for the codec* binaries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28768 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 10:52:26 +00:00
Uoti Urpala 66f6f9f076 Merge svn changes up to r28712 2009-02-23 21:00:52 +02:00
diego 0cddea3754 Add statistics audio filter that prints information about the audio stream.
patch by Nicolas George, nicolas.george normalesup org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28696 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-21 21:27:27 +00:00
Uoti Urpala 186e5a998c Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
2009-02-18 01:45:36 +02:00
reimar 7e9fd9351c Add support for VDPAU video out, including hardware decoding.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 20:58:13 +00:00
Uoti Urpala 0bf2bd91ec Merge svn changes up to r28610 2009-02-16 02:39:58 +02:00
reimar b8c7c3ff11 Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files.
Also restructure the code so it provides a pixfmt2imgfmt function, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:57:47 +00:00
Uoti Urpala 738f66b1bc Merge svn changes up to r28549 2009-02-13 03:52:51 +02:00
diego 62ca18ed47 Ignore errors from all rm commands in clean targets.
This way make will not stop on failure and remove as much as possible.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28540 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 12:32:16 +00:00
diego 802f91138e On clean/distclean, remove binaries with all types of executable suffixes.
This helps clean a tree completely before and after crosscompiling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28539 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 12:17:50 +00:00
diego 1c8e4bfc9f Use addprefix and addsuffix functions to generate TOOLS variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28538 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 12:13:07 +00:00
Uoti Urpala 1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02:00
diego cdfafa6999 Add priority support for OS/2 and factorize the Windows priority support.
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28520 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-10 15:34:44 +00:00
diego 49f88ad861 Conditionally compile aclib.c instead of placing #ifdef around its content.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28483 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-08 03:42:00 +00:00
diego 57f3f10ad0 cosmetics: Remove stray tab.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28464 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-04 18:34:39 +00:00
diego 4bfd1ebc96 We use libdvdcss 1.2.10, not 1.2.9.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28463 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-04 18:32:32 +00:00
Uoti Urpala 9790f4e6e7 Merge svn changes up to r28461 2009-02-04 00:28:17 +02:00
diego 74a216ea56 Remove -c option from install commands. It is ignored by GNU install and
incompatible with some other install commands.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28423 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 11:32:58 +00:00
diego e7ecd5119a Slightly simplify VIDIX_PCI_FILES command.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28410 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-31 22:46:12 +00:00
Uoti Urpala ccf4d9e96c Merge svn changes up to r28403 2009-01-31 04:52:15 +02:00
diego eb4a4604c0 HAVE_3DNOW --> HAVE_AMD3DNOW
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-26 09:29:53 +00:00
diego 418ce8eb05 version.h depends on version.sh.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28369 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-26 09:11:23 +00:00
Uoti Urpala dd888b05ff Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg.

Conflicts:
	Makefile
	configure
	mplayer.c
2009-01-26 00:58:15 +02:00
diego 401ea8e1db HAVE_3DNOWEX --> HAVE_3DNOWEXT
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28361 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 21:03:02 +00:00
diego 2067a1f750 Factorize print_version().
Print CPU information in verbose mode instead of by default.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28360 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 20:35:58 +00:00
Uoti Urpala 9bcd12fdf5 Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
2009-01-15 05:57:31 +02:00
reimar 1ee1a271f8 Support an "internal" dvdnav version to make it easier to compile with,
test and debug dvdnav SVN.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28291 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 13:51:02 +00:00
reimar 4af9bf7e02 Switch internal dvdread to libdvdread SVN external.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-08 19:28:28 +00:00
Uoti Urpala c1b80dcbbb Merge svn changes up to r28204 2008-12-27 17:40:57 +02:00
Uoti Urpala 64b22229e3 Makefile: Fix live555 compilation
The change to create .d files with .o incorrectly used CFLAGS instead
of CXXFLAGS when compiling .cpp files. This broke the build if
live555, which is the only part using C++ code, was enabled.
2008-12-22 16:45:32 +02:00
diego 91748b4278 libavcodec/i386/ was renamed to libavcodec/x86/.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28177 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-22 09:20:18 +00:00
Uoti Urpala 71b25cca76 Merge svn changes up to r28162 2008-12-19 00:29:24 +02:00
diego 42a8a5a388 another round of armv4l --> arm changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28159 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-17 08:47:01 +00:00
diego e3f05c1247 libavcodec/armv4l/ was renamed to libavcodec/arm/.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28158 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-17 01:10:34 +00:00
Uoti Urpala bc4c570ab1 Makefile: prevent default build rules being used on FFmpeg files
After adding .o files to the dependencies of FFmpeg .a files make
tried to build those .o files with default rules before recursing to
the FFmpeg subdirs. Fix this by adding a dummy rule. Also fix
incorrectly placed parentheses in the command creating the FFMPEGFILES
list. That resulted in some files being listed multiple times,
triggering warnings from the dummy rule.
2008-12-06 06:21:53 +02:00
Uoti Urpala a36945fe44 Makefile: Rebuild FFmpeg libraries when .asm and .o files change
There was a missing dependency that meant FFmpeg libraries were not
recursed if only .asm files changed. Also add a dependency on .o files
to update the corresponding .a (though this case should only happen if
you run compilation commands manually).
2008-12-06 05:33:33 +02:00
Uoti Urpala 2a6178e5ab Makefile, common.mak: Create .d files when creating corresponding .o
The separate .d file creation logic has caused various problems, most
notably cases where 'make' exits without doing anybut but without
giving any error either. Change the Makefile so that .d files are
always created or updated when the corresponding .o file is. This
avoids the problems of current .d file generation and still gives
correct dependencies.

The common.mak change does the same for the libswscale build. However
it does not affect the directories under ffmpeg/ because those use
ffmpeg/common.mak. The MPlayer common.mak can be copied over the
ffmpeg/common.mak file to make the fix apply to the FFmpeg directories
too. This is not done automatically because the FFmpeg file is under
version control and changing it could cause problems.
2008-12-06 05:33:33 +02:00
Uoti Urpala b37a869f13 Makefile: Don't use "install -d" on existing directories
Makefile used "install -d" on directories like "/usr/local/bin".
Because the install program always tries to set permissions this
command causes an installation failure if the directory exists and is
writable but you cannot change its permissions (default configuration
for group staff on Debian for example). So avoid running such commands
on existing directories.
2008-12-06 05:33:32 +02:00
Uoti Urpala 8c144171bb Merge svn changes up to r28087
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
2008-12-04 01:55:52 +02:00
diego 6ee9519304 Treat video output objects the same as everything else in the build system,
i.e. have lines that conditionally enable each in the Makefile and
corresponding variables set from configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28080 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 14:48:31 +00:00
diego c485f7b15c cosmetics: Rename ZORAN Makefile variable to ZR for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28077 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 12:47:29 +00:00
diego 187f10e142 Treat audio output objects the same as everything else in the build system,
i.e. have lines that conditionally enable each in the Makefile and
corresponding variables set from configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28075 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 12:05:47 +00:00
Uoti Urpala 14d3193391 Makefile, codec-cfg.c: Don't use EXTRA_INC flags for codec-cfg compile
codec-cfg runs on the host system but EXTRA_INC can have target system
paths. The EXTRA_INC was added there for shared libavutil support.
Copy the one #define codec-cfg.c needs from libmpdemux/aviheader.h
(which in turn needed libavutil) instead of including the header, and
drop the EXTRA_INC flags.
2008-12-02 20:54:13 +02:00
Uoti Urpala e62517ef6a Merge svn changes up to r28065 2008-12-02 18:02:05 +02:00
diego c612907d1c MNG demuxer by Stefan Schuermans, stefan blinkenarea org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28052 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-30 13:22:34 +00:00
Uoti Urpala 1715c2a336 Merge svn changes up to r27949
Conflicts:
	common.mak
	libvo/vo_xv.c
	libvo/x11_common.c
	libvo/x11_common.h
	stream/cache2.c
2008-11-17 20:50:23 +02:00
bircoph 29f16f45f1 Add yasm support to the build system.
This allows to use yasm assembler optimizations from FFmpeg code,
in particular, from libavcodec/fft.c.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27940 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-16 13:04:16 +00:00
Uoti Urpala 0301309425 Merge svn changes up to 27824
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
2008-10-25 05:12:34 +03:00
diego 6fa340d54c Create LIBDIR for binary codecs upon make install.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27793 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 20:25:41 +00:00
Uoti Urpala ebb4abf208 Merge svn changes up to r27682
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.

Conflicts:
	command.c
	mplayer.c
2008-10-02 05:17:23 +03:00
diego 0189fa7cac 10l: Remove deleted file libmpeg2/motion_comp_iwmmxt.c from Makefile as well.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27678 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-01 06:47:26 +00:00
Uoti Urpala 849dc0ba31 Merge svn changes up to r27649
Conflicts:
	Makefile
	configure
	libvo/x11_common.c
2008-09-20 16:13:33 +03:00
rathann c8d9bf0f50 Add shared libswscale support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27632 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-16 22:30:22 +00:00
rathann a5e9a8d0ca External liba52 support, part 2 of 2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27620 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 16:32:31 +00:00
diego 853d571d48 Use standard -I flags to compile codec-cfg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27618 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 15:34:26 +00:00
Uoti Urpala b56858342f Merge svn changes up to r27514 2008-09-03 10:16:30 +03:00
rathann 97e5f304ce Rename internal libdvdread fork from dvdread to libdvdread
to avoid clashing with external libdvdread.
(Sync with libdvdread r1122)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-30 12:22:21 +00:00
diego c7c06f3050 Remove SKIP_DEPS trick. The same effect can be achieved without it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27471 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-18 06:30:10 +00:00
diego 5c30ab6feb FFmpeg no longer has fastmemcpy support, so no longer trigger recursing
into the FFmpeg directories if libvo/fastmemcpy.h changed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27465 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 20:42:54 +00:00
Uoti Urpala e09fe1ce04 Merge svn changes up to r27458 2008-08-12 15:03:34 +03:00
ben 8903c510f8 Add VIDIX driver for SuperH Mobile VEU hardware block.
Patch by Magnus Damm <magnus dot damm at gmail dot com>.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27452 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 23:10:03 +00:00
diego 6d01235f44 Skip dependency generation if we just run distclean or if skipping
is requested explicitly on the command line.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27443 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-09 13:53:19 +00:00
Uoti Urpala 17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03:00
diego af76be6e19 Add separate variables for CFLAGS that are specific to internal libraries
and only add them to CFLAGS when compiling objects from those libraries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27436 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 21:46:06 +00:00
diego b3e99753a3 cosmetics: Rename some CFLAGS-related variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27434 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 21:03:14 +00:00
diego 2d6b7f320b 10l: Remove stray backslash at end of line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27433 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 20:32:02 +00:00
diego d04687fc92 Merge two redundantly declared lines into one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27432 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:36:31 +00:00
diego a64801ec63 cosmetics: Sort things into alphabetical order in various places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27431 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:35:34 +00:00
diego e0b1c9a6b7 Give a CONFIG_ prefix to preprocessor directives that lacked one and
change arbitrary prefixes to CONFIG_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:20:50 +00:00
diego 5641e60698 Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27426 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 10:57:40 +00:00
diego 34fb06087b Revert mistakenly committed temporary local change.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27405 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-03 16:20:34 +00:00
diego 02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-03 15:21:40 +00:00
Uoti Urpala 6cce822505 Merge svn changes up to r27399
Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c
2008-08-02 22:04:35 +03:00
diego e588ab056d Change a bunch of video-output-specific preprocessor directives from a HAVE_
prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27397 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 17:38:11 +00:00
Uoti Urpala 04f3909a72 Merge svn changes up to r27374
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
2008-07-30 16:39:24 +03:00
diego 771cd67118 Use conditional compilation instead of an #ifdef around the whole file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27371 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 10:26:23 +00:00