Commit Graph

31149 Commits

Author SHA1 Message Date
reimar 4ad8b9e0cc Use MP_NOPTS_VALUE as "default" pts for delayed frames instead of some
insanely large value.
Avoids hang if a decoder handles the data/size == 0 condition incorrectly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31205 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 23:22:25 +00:00
reimar 8e84b9288c Slightly reduce number of #ifs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31204 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 22:26:10 +00:00
reimar bc2adc2e48 Use an extra define to simplify ifdefs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31203 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 22:09:40 +00:00
reimar 991b9b9e6d Try reducing the #ifdef mess for the different cache variants.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31202 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 22:04:01 +00:00
reimar 939df8d5a8 Extract the cache main loop into a separate function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31201 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 21:58:50 +00:00
diego 7dcf9d45ed Remove ambiguous language about indenting if-blocks.
The previous version could possibly be misread in a way that forbids
reindenting if-blocks. The intended meaning, that whitespace changes
should be separated from other changes, is already implied from what
is written above that paragraph.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31200 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 21:56:22 +00:00
reimar 2ced41082c Optimize cache behaviour for the many-consecutive-seeks case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31199 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 21:53:48 +00:00
reimar cc7a2d3287 Add code to wake up cache process when e.g. a seek is needed.
Dramatically reduces seeking times with lavf ogg demuxer.
Needs a spearate implementation for the thread-based cache implementation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31198 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 19:49:28 +00:00
sesse eb9fffc32f Add ChangeLog entry about CineForm support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31197 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 17:05:55 +00:00
sesse 46f30279e7 Add final missing bits of CineForm HD support on Linux (via the Windows
DirectShow codec).

Required changes:

 - codecs.conf entry (of course).
 - Allow opening files with “.col” in the file name, just like “vp3” and “.fpf”
   already was allowed. (CineForm expects to be able to do this, presumably
   for some color management code.)
 - In registry.c, fake a few registry keys that the codec expects the installer
   to have written. Also, change a few magic numbers (0, 2) to the appropriate
   constants (ERROR_SUCCESS, ERROR_FILE_NOT_FOUND) where appropriate, so the code
   is easier to follow.

SMP works fine, but seemingly performs suboptimally (e.g., on my dual-core
laptop, CineForm performs better if I lie to it and tell it I have four cores).
I don't know if this is inherent in the codec, or some inefficiency in the
emulated synchronization primitives.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31196 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 16:01:12 +00:00
diego 90ccea6639 Remove unused function MODULE_DecRefCount(), fixes the warning:
loader/module.c:618: warning: 'MODULE_DecRefCount' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31195 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 15:50:49 +00:00
diego abe39bb76f K&R coding style should be applied to new code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31194 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 15:07:34 +00:00
diego cc75267c6b cosmetics: reformat ad_pcm.c in K&R style
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31193 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 14:15:27 +00:00
stefano 505326f6df Add empty newline to separate function declarations, for better
readability.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31192 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 10:02:30 +00:00
cehoyos 1dce94a26d Ignore (but print out) offset with libtheora decoder.
Patch by Giorgio Vazzana, mywing81 gmail


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31191 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-22 16:32:39 +00:00
cehoyos 4e2622ed33 Do not use correct-pts for mpeg-ps: It breaks PAFF samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31190 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-22 01:17:59 +00:00
reimar 0dd2ddd2bc Change WAV header updating in ao_pcm to allow to up to almost 4GB size.
Patch by Rob McMullen [robm users sourceforge net]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31189 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-21 17:19:01 +00:00
jrash cb3496d251 sync with en/mplayer.1 rev. 31173
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31188 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-21 11:20:23 +00:00
iive 31bc24b1d8 Fix compilation broken by FFmpeg-r23201 that changed the api of error logging.
Also fix evaluation after FFmpeg-r23149 "change order of parameters".
Let the filters fail if evaluation can't be done.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31187 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-20 23:17:41 +00:00
stefano 764539a98c Cosmetics: make more compact the code for handle_jpeg(), this also allows
vertical alignment. Improve readability.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31186 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 22:56:41 +00:00
stefano 3c88e5fdc3 Remove PI definition and use M_PI instead.
M_PI is defined by the included file libavutil/mathematics.h.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31185 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 22:49:04 +00:00
reimar 7be96c3792 Do not return pointer to on-stack memory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31184 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 17:58:17 +00:00
reimar d08822aaac Fix return value (it was missing completely).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31183 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 17:55:39 +00:00
reimar f62044777b Handle -wid Window being closed for direct3d and gl vos on Windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31182 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 17:53:47 +00:00
lorenm f53f31894c 13% faster yuv420 to rgb15 mmx.
It is now faster than the old gpl version on conroe.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31181 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 13:31:11 +00:00
lorenm d919d834fe 40% faster yuv420 to rgb24 mmx.
It is now faster than the old gpl version on conroe.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31180 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 08:21:56 +00:00
reimar 5c74db3bf6 Quit MPlayer if we receive a DestroyNotify event.
This in particular avoids MPlayer continuing to play when
a frontend using -wid crashed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31179 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 18:00:04 +00:00
diego e4fc48153e vf_zr requires the lavc MJPEG encoder even when MEncoder has been disabled.
This fixes compilation with vo_zr enabled and MEncoder disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31178 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 16:56:43 +00:00
diego 0624a90c9a Remove duplicate and nonsense libavencoders #define for OpenCORE AMR-WB.
OpenCORE AMR-WB only has a decoder, no encoder.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31177 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 16:13:53 +00:00
diego 0a33fdb83a Check for termios.h before sys/termios.h.
The former location is the more current and standard variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31176 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 15:34:30 +00:00
cehoyos b6bcfb4f00 Enable libavcodecs new MPEG-1 Audio float decoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31175 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 14:24:16 +00:00
cehoyos 2b26048cca Fix compilation after r31173.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31174 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 14:20:19 +00:00
siretart e3f191fa3f remove vf_yuy2, functionality is replaced by -vf format=yuv2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31173 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 13:49:05 +00:00
cehoyos aaba0aea70 Silence a gcc warning about char trying to be packed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31172 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-13 20:48:55 +00:00
compn 30ead7d5d3 move 'dvdsublang... moviename en,eng,' message to debug level.
change 'dvdsublang' to 'potential sub', subtitles werent always dvd related.
also change output to only output selected subtitle.
patch by ubitux at gmail.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31171 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-13 18:11:45 +00:00
ramiro 210601a953 Revert r31153. It failed to build on:
x86_64 / Mac OS X gcc 4.0.1
x86_64 / Linux icc (all)
x86_64 / Linux gcc 4.0.4
x86_64 / OpenBSD gcc 3.3.5
x86_64 / Linux suncc 5.10
and there are some reports of crashes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31170 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-12 20:47:32 +00:00
diego 8c9cb24a48 Mention removal of internal liba52 copy in Changelog.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31169 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-12 08:29:55 +00:00
diego 885d95c7c5 10l: Use the directory part of the stylesheet path to create a directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31168 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 22:31:47 +00:00
diego 3dd0551a26 cosmetics: Invoke all shell scripts during XML documentation build directly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31167 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 21:33:15 +00:00
diego 997f8e8c10 Create output directory when copying stylesheet.
This eliminates one rule and simplifies dependencies.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31166 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 21:31:36 +00:00
diego 5082b8de29 Merge both XML documentation README files into one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31165 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 21:25:12 +00:00
diego f7d7d2db33 Do not run xmllint prior to building the XML documentation.
xmllint is just a convenient way to check for syntax errors;
it is not a requirement to build the documentation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31164 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 21:21:45 +00:00
diego eabca4e7b2 XML docs: Make xmllint-* targets a dependency of html-chunked-*/html-single-*.
Since the xmllint-* targets are phony, they should never be a dependency
of real targets, so make them a dependency of the phony html-chunked-* /
html-single-* targets instead. This is just as correct, but now the docs are
regenerated when dependencies change and not with every make invocation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31163 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 14:27:26 +00:00
diego 0e9b9da3b2 Only mark targets whose names end in "clean" as phony.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31162 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 13:27:13 +00:00
diego 51ac751241 docs: Update documentation to account for recent build system changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31161 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 13:17:26 +00:00
diego 8de8a1c713 Make XML documentation build process nonrecursive.
This greatly simplifies the documentation build process and the Makefiles.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31160 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 13:13:32 +00:00
diego e3d4e1a3ce Get rid of pointless variable indirection for XSL stylesheets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31159 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 11:52:41 +00:00
diego c8e40a8fba libdvdcss is now synced to a recent upstream Subversion snapshot.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31158 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 11:13:07 +00:00
diego 6f3e65b6f5 libdvdcss: Fix potential format string crash; check RPC status on disc access.
This merges upstream revisions 223 and 224 + 225.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31157 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 11:10:28 +00:00
diego ec814ff637 libdvdcss: OS/2 support; this merges upstream revisions 220 and 229.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31156 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 10:58:50 +00:00