Commit Graph

31981 Commits

Author SHA1 Message Date
Uoti Urpala 2f1a518d45 Merge svn changes up to r31211
The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.
2010-05-30 16:14:55 +03:00
Uoti Urpala 9b68a49d01 Merge svn changes up to r31197 2010-05-30 15:58:55 +03:00
Uoti Urpala 37a3e71558 Skip svn changes up to r31194 2010-05-30 15:56:36 +03:00
Uoti Urpala 491ac8ef1a documentation: remove svn-howto.txt, MAINTAINERS
svn-howto.txt doesn't apply to this tree, and MAINTAINERS had little
to do with reality even in svn.
2010-05-30 15:54:53 +03:00
Uoti Urpala adbb0477a0 Merge svn change r31191 2010-05-30 15:53:08 +03:00
Uoti Urpala ee129202ca Skip svn r31190
The svn commit is another attempt at working around problems without
understanding them, and the problem in question should only happen in
svn.
2010-05-30 15:52:26 +03:00
Uoti Urpala e74361c488 Merge svn changes up to r31189 2010-05-30 15:51:33 +03:00
Uoti Urpala 1ffe8bece5 Skip svn changes r31177, r31178
Internal FFmpeg build stuff.
2010-05-30 15:39:29 +03:00
Uoti Urpala a286506467 Merge svn changes up to r31176 2010-05-30 15:37:34 +03:00
Uoti Urpala 36cce81353 Skip svn changes r31170, r31171 2010-05-30 15:32:11 +03:00
Uoti Urpala 6f199ab3d9 Merge svn changes up to r31169 2010-05-30 15:27:58 +03:00
Uoti Urpala 18657beb19 Merge svn changes up to r31145 2010-05-30 15:21:18 +03:00
reimar 3ae81e84be Change compiler argument order for compile_check to avoid incorrect linking
errors during detection with static libraries (in particular OpenGL + static SDL).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31282 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 12:14:40 +00:00
reimar 8830acfc73 Make 3dnow and MMX code compile for 64 bit (just stupid search-and-replace).
They are not compiled/enabled on 64 bit though, since they are vastly slower
but would still be selected by default.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31281 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 10:01:40 +00:00
diego 8829003b51 Add codec-cfg.h to the dependency list of codec-cfg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31280 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 09:47:53 +00:00
diego 89a63012c5 Rename yuv2rgb_template2.c --> yuv2rgb_template.c now that the other is gone.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31279 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 08:44:05 +00:00
diego 02c0705f98 Remove GPL-licensed YUV to RGB MMX routines.
We now have an LGPL replacement that is at least equally fast.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31278 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 08:31:23 +00:00
hyc 76f5a30854 Add librtmp support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31277 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 05:16:29 +00:00
diego 5007aa845f Cast void* pointer to appropriate type before using it in an addition; fixes
libmpdemux/demux_mkv.c:1873: warning: pointer of type 'void *' used in arithmetic


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31276 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 22:22:07 +00:00
diego 3f5d916cc4 Update 1.0rc3 release name and date.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31275 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 22:17:26 +00:00
siretart 101bb55ec2 minor spelling fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31274 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 22:04:35 +00:00
siretart 5b06ea780d add myself to the AUTHORS file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31273 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 22:02:25 +00:00
reimar da33f53b55 Use edi instead of ebx to avoid issues with PIC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31268 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 16:34:01 +00:00
reimar 7f62842e74 Remove obsolete may_alias-related defines, lavu handles this now
directly with compiler-version checks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31267 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 15:07:16 +00:00
reimar b2219eaa07 Actually run a detection whether external libass exists, instead
of just assuming it does when internal libass is disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31266 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 14:57:17 +00:00
reimar 2bdc2412a1 Fix compilation if the compiler does not support -march=amdfam10
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31265 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 14:44:02 +00:00
Uoti Urpala 1888e57af7 cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.

Patch by Diego Biurrun.
2010-05-29 17:20:44 +03:00
diego 47d1b72f46 cosmetics: Drop leading '_' from noinputmodules variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31264 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:43:51 +00:00
diego bce7550929 misc cosmetics: K&R style nits, #include placement, indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31263 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:13:39 +00:00
diego 36edf0ef69 Mark key_type structure as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31262 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:11:55 +00:00
diego 1f14172166 getch2-os2.c: Add #include for the header that declares the public functions.
This should fix a bunch of warnings on OS/2.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31261 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:10:30 +00:00
diego e962e643be cosmetics: Remove some commented-out #includes, fix a comment grammar error.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31260 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:07:10 +00:00
diego 6dda52e496 Directly mark jpeg_buf_src() as void instead of using some indirection marcro.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31259 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:06:29 +00:00
compn 52cc89f751 add "lpcJ" fourcc for the RealAudio 1.0 codec.
patch by Francesco Lavra


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31257 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 21:03:29 +00:00
reimar a564c5a6cc Fix typo in message.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31256 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 20:59:53 +00:00
reimar 6b255e5083 stream_check_interrupt should sleep even if no callback is set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31255 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 18:49:02 +00:00
reimar 27d41fa5b3 100l, stream_check_for_interrupt argument is not in usec,
so we would end up sleeping for 10s instead of 10ms.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31254 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 18:47:03 +00:00
reimar 16e3978e1e Document time scale for stream_check_interrupt argument.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31253 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 18:45:25 +00:00
reimar d7f19144b1 Document that time argument is in milliseconds.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31252 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 18:44:41 +00:00
reimar 6f7c1ea409 Improve handling of cache process/thread hanging/being killed.
In particular allow a single STRG+C to quit MPlayer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31251 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 17:26:31 +00:00
reimar 4448190ef0 Fix cache process accidentally being killed by SIGUSR1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31250 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 16:57:16 +00:00
cehoyos 95e8630981 Use MSGT_DECVIDEO in a video decoder.
Patch by Giorgio Vazzana, mywing81 gmail


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31249 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 11:52:12 +00:00
diego f5f6bbaa09 Remove commented-out declaration of nonexisting function uGetTimer().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31248 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 08:39:02 +00:00
diego c0262f7435 Drop pointless _t suffix from 'struct lavf_priv'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31247 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 00:25:28 +00:00
diego 72ba1c8fec Drop pointles _st suffix from struct mp_cmd_filter and mp_cmd_bind_section.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31246 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 23:36:03 +00:00
diego 495115f2f1 cosmetics: vertical alignment in msg module help output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31245 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 23:21:16 +00:00
diego 3e830f876e vf_yuy2 was removed after the 1.0rc3 branch was cut.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31244 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 22:43:49 +00:00
diego 76c2abc99f small cosmetics for the 1.0rc3 changelog
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31243 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 22:43:14 +00:00
diego ae85fe1d2f Fix a bunch of typos in the stream cache code.
patch by Giorgio Vazzana, mywing81 gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31242 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 22:18:10 +00:00
diego 5796e96b36 Drop pointless _s suffix from 'struct af_stream'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31238 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 20:59:40 +00:00