1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 12:22:22 +00:00
Commit Graph

31067 Commits

Author SHA1 Message Date
diego
9d38fc0678 Move some FFmpeg-specific entries to the FFmpeg section of config.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30958 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-25 18:51:57 +00:00
sesse
af6fb3740e Don't try to delete the global memory mutex in the Win32 loader code,
since it's now statically allocated and will not be reallocated if a new
allocation comes along.

This also fixes an issue where the mutex would not always be properly
unlocked, leading to deadlocks. I thought I'd committed that ages ago,
but obviously not, and it broke CineForm initialization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30957 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-25 12:58:41 +00:00
diego
a630204d0a Mark add_subtitles() as static, it is not used outside the file, fixes:
mencoder.c:337: warning: no previous prototype for 'add_subtitles'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30956 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-24 20:43:41 +00:00
diego
b78d83301a Remove /usr[/local]/lib/win32 from the list of Win32 codec search paths.
These paths have been deprecated a long time ago, just searching the
default binary codec path is enough nowadays.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30955 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-24 01:07:11 +00:00
diego
1b58868670 AltiVec implies a PPC CPU, so there is no need to check for both.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30954 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 22:59:14 +00:00
diego
983b920137 loader: Remove commented-out extra_ld_library_path cruft.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30953 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 20:24:14 +00:00
diego
5b7bffa713 Do not compile AltiVec code when AltiVec is not available; not even in
runtime cpudetection mode.
Fixes compilation with '--enable-runtime-cpudetect --disable-altivec'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30952 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 20:12:52 +00:00
reimar
f76e141402 Make http_read_response fail if parsing the response failed.
Avoids possible crashes since other code assumes http_hdr->protocol
is a valid string if it succeeds.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30951 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 19:45:33 +00:00
diego
db734715dc Fix build due to codecs_path vs. codec_path typo.
patch by Erik Auerswald, auerswal unix-ag.uni-kl de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30950 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 19:40:37 +00:00
diego
5e480c7b81 Get rid of pointless def_path variable; use codec_path directly instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30949 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 18:01:00 +00:00
diego
cb26eaf0bb Real binary loader code should respect the binary codec path.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30948 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 17:52:46 +00:00
reimar
364fb6d26f Reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30947 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-22 19:39:43 +00:00
reimar
b28b15db30 Start probing with a size matching the stream buffer size so it is possible
to restart without seeking even without cache for easily detectable formats.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30946 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-22 19:38:42 +00:00
attila
a1f7ee1a4b Make all instances of codec_patch unconditional, otherwise
compilation will break on systems that do not have win32 dlls
enabled. Fixes compilation bug introduced by r30942

10l to the anonymous guy who explains the importance of commit messages
and would like to have romance novels in these very messages.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30945 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-21 10:13:00 +00:00
diego
d84999d480 Rename SetCodecPath() --> set_codec_path().
This keeps the naming of all path-related functions consistent.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30944 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-21 08:34:09 +00:00
diego
70c66c0476 Rename get_path.[ch] --> path.[ch].
These files now contain different functions related to path handling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:38:27 +00:00
diego
a06a3d476d Move SetCodecPath() from loader to get_path.c and make it unconditional.
This fixes compilation with the Win32 loader disabled but other binary
codec loaders enabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30942 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:27:07 +00:00
jrash
64c4d367af sync with en/mplayer.1 rev. 30936
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30941 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 01:33:54 +00:00
reimar
443a427b0e Remove unnecessary size limits and a related define for hm12 decoder.
Patch by Stephen Warren [swarren nvidia com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30940 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 19:44:02 +00:00
reimar
498bd63ccc Use vd_raw to handle NV12/NV21 formats, since we support them as pixel formats
there is no need to do any conversion during decoding.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30939 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 19:42:23 +00:00
diego
0f759a5da0 Replace wrong condition name in #endif comment by correct instance.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30938 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 09:58:45 +00:00
diego
2406c23406 Check whether COMPILE_ALTIVEC is defined, not if it is set to a 0/1 value.
COMPILE_ALTIVEC is never set to 1, it is just #defined.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30937 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 09:57:36 +00:00
diego
a04b23c3b3 Drop support for XANIM_MOD_DIR environment variable.
It is now possible to specify alternative codec paths on the comand line.
Furthermore, XANIM_MOD_DIR was never properly documented.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30936 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 23:37:57 +00:00
diego
0e1acdbf9b Reuse codec path variable used in the binary loader in the XAnim loader.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30935 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 23:32:14 +00:00
cehoyos
e3e6f84258 Extend the generic path of the yuv2rgb converter with support for rgb444
output format.

Patch by Janusz Krzysztofik, jkrzyszt A tis D icnet D pl 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30934 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 23:02:32 +00:00
aurel
3f8efed4d9 cosmetics: indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30933 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 21:53:53 +00:00
aurel
4709cde305 add support for lavf style extradata in vd_theora
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30932 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 21:53:02 +00:00
diego
77b8678bec Remove unnecessary #ifdefs around harmless loader/codecpath.h #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30931 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 20:57:49 +00:00
reimar
a743c0a738 Split codec path related code into a separate file to fix Windows build.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30930 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 20:44:01 +00:00
cehoyos
70017fa388 Fix first line(s) of vo vdpau documentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30929 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 00:45:18 +00:00
sesse
67b20ea611 Fix thread safety issue in mreq_private: last_alloc was accessed from multiple
threads without being under a mutex.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30928 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 23:42:11 +00:00
sesse
c7dbfb6467 Announce Windows XP SP2 instead of Windows 95 OSR2.
It's time we move to 2010: Announce Windows XP SP2 to codecs instead of Win95
OSR2.

Note: We still don't support the *Ex fields in the version info struct
properly (we shouldn't really overwrite the structure size, but rather check
it to see if it's safe to fill the extra fields). No codec I've found seems
to care.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30927 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 23:38:26 +00:00
sesse
d5f3f8caab Announce SMP support for Win32.
Don't hardcode dwNumberOfProcessors=1 for Win32 anymore; the mutex/event code
is still far from perfect, but now good enough that I can't find any codecs
that breaks with this (tested on a quad with various codecs). This tells
codecs they can use more than one core if they want to (some already did, by
launching multiple threads even when told there was only a single core).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30926 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 23:33:26 +00:00
diego
9e8f301f22 Introduce mak_enable function to set variables in config.mak.
This avoids manually setting target architecture and CPU extensions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30925 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 14:41:32 +00:00
diego
d32a13a467 Rename SGI_MIPS architecture to plain MIPS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30924 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 14:09:09 +00:00
diego
82b8a649ae Drop libavcodec_arch hack; ARCH can now be set directly in config.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30923 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:55:59 +00:00
diego
c52aed20ee Lowercase arch and subarch values.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30922 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:41:54 +00:00
diego
0be7b19c27 cosmetics: Drop leading underscore from cpuexts variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30921 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:37:36 +00:00
diego
dc440b47d3 Make ff_config_enable work with lowercase values.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30920 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:34:33 +00:00
diego
f3928b9464 Split subarch handling off from generic arch handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30919 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:20:06 +00:00
diego
3cd1525bf3 Prefer FFmpeg AAC decoder over libfaad.
This is a tentative change to give the decoder more testing;
it can always be reverted in short order if it turns out suboptimal.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30918 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 12:39:21 +00:00
diego
0426d5d72d Rename libopencore AMR decoder entries.
FFmpeg now has an AMR-NB decoder, this avoids name clashes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30917 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 12:35:36 +00:00
cehoyos
8e8387f7bd Fix compilation after FFmpeg r22569 at least for some architectures.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30916 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 10:46:18 +00:00
diego
43ccbad38c cosmetics: Drop leading underscores from arch variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30915 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 10:10:47 +00:00
komh
11eeaf5005 Follow a more proper way to support -codecpath.
1. Include loader/drv.h for SetCodecPath() instead of a declaration of it.

    2. Move codec_path from get_path.h to mpcommon.h and mpcommon.c.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30914 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 09:12:51 +00:00
sesse
f414a15b33 Fix return value of InitializeCriticalSectionAndSpinCount.
InitializeCriticalSectionAndSpinCount returns a nonzero value on success,
and some codecs (notably VP7) seemingly got confused when it didn't, if and
only if we tried to emulate NT or newer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30913 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 22:08:56 +00:00
diego
e4905ab24f Remove unused variable, fixes the warning:
libmpcodecs/vd_qtvideo.c:242: warning: unused variable 'result'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30912 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 14:35:43 +00:00
sesse
9ffcd31e7d Fix libmpcodecs/vd_qtvideo.c compilation on OS X:
- Declare the "result" variable even for native QuickTime.
 - ExitMovies returns void; don't check its result value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30911 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 14:30:31 +00:00
diego
c19c71be2b Remove some commented-out debugging and similar cruft.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30910 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 12:38:29 +00:00
diego
0e8f7d0e58 Remove unnecessary forward declarations for a bunch of functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30909 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 12:24:18 +00:00