Commit Graph

29603 Commits

Author SHA1 Message Date
reimar dcfd043ea8 10l, -framework QuickTime must be added to extra_ldflags, not libs_mplayer since
QuickTime is used also in mencoder (in the audio and video decoders and possibly
from demux_mov, even though the latter one should only use the includes and not
require linking).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29644 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 12:24:45 +00:00
reimar a8580cbcf2 Disable liba52 SSE imdct for x86_64+PIC (e.g. OSX 64 bit) since it will
not compile for that combination.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29643 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 10:31:24 +00:00
reimar 8bac9079bf Support x86_64 + PIC in mangle.h, needed for OS X 64 bit compiles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29642 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 09:50:17 +00:00
reimar 0f4dfe16f8 Split QuickTime check off from quartz check and use the result to enable/disable
the QTX codec support.
This is necessary since 64 bit compiles on OS X 10.5 at least do not support QuickTime.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29641 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 09:35:58 +00:00
reimar bceec9b4b2 100l, SIZE_MAX must be UINT_MAX to prevent an integer overflow later on,
also it is preferable if demuxer parsing does not differ between architectures.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29640 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 09:21:06 +00:00
reimar 4338a8d7f4 Move OpenGL test below CoreVideo. This ensures -lGL will come after -framework OpenGL which
resolves vo_corevideo crashes due to namespace conflicts (e.g. glEnable, glBegin, ...).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29639 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 07:57:06 +00:00
reimar 39ed8ed063 Improve wording for file/directory specific config file explanation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29638 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-03 06:59:14 +00:00
reimar 9600686eb5 10l, fix misplaced check in r29613, for loop detection we must compare
current file name against full name to be added, not current file name
against new base path.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29637 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 19:55:24 +00:00
reimar 76cb85c056 Limit amount of data allocated on stack, strlen(filename) is not a good idea for
file name strings that might come from arbitrary playlists, use PATH_MAX instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29636 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 19:49:10 +00:00
reimar 8eaac76141 Document directory-specific configuration file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29635 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 19:44:15 +00:00
reimar 7e8ff35fd2 Add support for directory-specific mplayer.conf configuration file.
Patch by Christian P. Schmidt "schmidt digadd de"


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29634 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 19:43:05 +00:00
faust3 758980965c enable ffwmapro
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29633 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 17:49:24 +00:00
reimar d0c1992160 Consistently use sizeof(variable) instead of sizeof(type) where easily possible.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29632 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:18:01 +00:00
reimar 25cc492d90 Cosmetics: get rid of many pointless ()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29631 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:11:30 +00:00
reimar 7a7c246709 Reduce code duplication for half/normal/double video size handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29630 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:02:15 +00:00
reimar 001e4be0ba Remove unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29629 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 11:38:18 +00:00
reimar 790e41cf8f The suboption parser now takes a const options list, so mark them all const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29628 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 11:33:37 +00:00
reimar 46a0ddd36e free(), delete and delete[] are all different and can't just be used at random,
so change code to use the one appropriate for the allocation used.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29627 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 11:07:02 +00:00
reimar d1e7b4dc6f Fix possible crashes with invalid SDPs that result in stream descriptions
not being initialized.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29626 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:55:36 +00:00
reimar ac11b35a6a Fix several more rtsp-related memleaks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29625 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:44:26 +00:00
reimar 70a247b26d Fix asmrp_dispose to also free the buffer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29624 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:37:32 +00:00
reimar 2726fe03ec Use calloc to ensure rmff_new_mdpr returns fully initialized data.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29623 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:35:06 +00:00
reimar 3351bc2d18 Move variable declaration to where it is used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29622 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:28:08 +00:00
reimar 079a64ae8d Make sure we do not strdup(NULL), avoids a crash with non-real streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29621 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:22:08 +00:00
reimar 5c4a06530d Fix several memleaks in real_setup_and_get_header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29620 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:20:45 +00:00
reimar 24e788fc4c Change real_setup_and_get_header to use goto a single exit path to simplify
proper freeing of allocated data.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29619 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:10:42 +00:00
reimar 144b7f5989 vo_quartz: change deallocation/uninit to more reliably free allocated data.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29618 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 09:51:38 +00:00
reimar 1b3c42472d Make glContext a local variable, it is not needed outside the function
where it is allocated, reference counting takes care of freeing it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29617 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 21:16:58 +00:00
reimar 9ad17fad92 Add a dealloc function to corevideo to reduce the memleaks from
(for my sample) about 12 MB to 2 MB.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29616 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 21:12:33 +00:00
reimar cb9e32c88c Fix some of the major memleaks of vo_corevideo with -fixed-vo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29615 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 20:09:01 +00:00
reimar e8d5289623 Do not do a unmap/map cycle on Windows given with -wid, with some window
managers this has the ugly side-effect of moving the window.
Instead call XInstallColormap to ensure the Colormap is installed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29614 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 16:39:46 +00:00
reimar d1ff4b7f90 Make the loop detection for mov reference files less aggressive, fixes
playback of http://stream.qtv.apple.com/qtv/wgbh/http/nova_eu/nova_eu_3012c01_mp4_ref.mov


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29613 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 15:52:13 +00:00
reimar a1f744cb07 Check setGlWindow return value to fail properly instead of crashing if e.g.
no OpenGL support is available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29612 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 15:20:05 +00:00
reimar 986499e97e Add a hack to ensure data from e.g. mov format -subfile gets read at all
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29611 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 15:00:49 +00:00
reimar 76699d67f0 Hack demux_demuxers so that demux_demuxers_fill_buffer is actually called.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29610 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 14:51:49 +00:00
reimar 7b7302b096 Make shm_fd a local variable and close it when we need it no longer, thus
fixing a file descriptor leak.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29609 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 12:12:45 +00:00
reimar 0f7fe32725 Reduce vo_corevideo memleaks by initializing static context etc. only once
in preinit and freeing the video-specific data before reallocating in config.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29608 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 10:48:47 +00:00
reimar b125a31886 Fix memleak when using fontconfig without a font name.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29607 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 10:17:22 +00:00
reimar d7676e783e Use MPlayer's standard aspect handling functions in corevideo
instead of reimplementing them incompletely.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29606 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 09:36:04 +00:00
diego 6720a0d0cd The libamrnb *en*coder, not the *de*coder should be added to the list of
encoders to enable in libavcodec.
patch by Wang William, william0wang gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29605 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 08:30:15 +00:00
reimar efdf0e5fc7 Fix per-file config file loading for DOS paths (i.e. where \ and : can
also separate path and file name).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29604 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 10:07:44 +00:00
reimar a0eda318e8 Factor out code to try and load a config file only if it exists.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29603 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:48:25 +00:00
reimar 1cd2feed03 Move variable declaration into block where it is used and make it const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29602 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:41:27 +00:00
reimar 7d0270087d Make m_config_parse_config_file file name argument const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29601 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:40:04 +00:00
cehoyos 5babf10d75 Fix MPEG-4 ASP in MPEG transport streams with -demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29600 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:35:56 +00:00
cehoyos 58794cf766 Fix EAC3 in MPEG transport streams with -demuxer lavf.
Patch by Wang William, william0wang gmail


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29599 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:09:00 +00:00
reimar 8eab1ca95c Also check linker flags to make sure that liveMedia libraries are there, too,
not just the headers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29598 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:00:37 +00:00
cehoyos 8593195592 Fix DTS in MPEG transport streams with -demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29597 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 08:42:36 +00:00
cehoyos 7a20e9060a Fix AAC in MPEG transport stream for -demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29596 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 08:31:12 +00:00
diego aa16e6ca7d cosmetics: alphabetically order lists
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29595 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 05:21:12 +00:00