Commit Graph

30808 Commits

Author SHA1 Message Date
greg ca7cbc0724 Enable ASS/SSA subtitle support in mencoder
Enable ASS/SSA rendering through libass in mencoder. This duplicates a
bit of code (to parse font attachments, for example). Additionally, add
a filter "fixpts" that generates PTS, simulating fixed fps. PTS
generated by this filter are then used for subtitle timing.

Original patch by Nicolas George. (nicolas.george normalesup.org)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30849 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 23:13:08 +00:00
sesse fbb74e16a3 Make GetModuleHandle(NULL) return a valid pointer.
Some codecs, and more recently Microsoft's CRT library, expect GetModuleHandle(NULL)
to return a pointer to the program's PE header mapped in memory. Thus, just returning
0x0 or 0x1 won't do it anymore, so create a minimal PE header and return that.

Patch originally by Gianluigi Tiesi ( mplayer (at) netfarm (dot) it ).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30848 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 23:09:36 +00:00
michael 75f3bd09ea try to avoid returning odd slices.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30847 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 21:39:27 +00:00
reimar 7852aff0c4 Reuse fb_tty_fd for setting up the text area.
This avoids the fopen call which could end up creating a /dev/tty file
if it did not exist.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30846 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 20:15:16 +00:00
jrash 4a6758e1fd sync with en/mplayer.1 rev. 30822
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30845 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 12:43:15 +00:00
sesse c27b99441b Partial revert of r30843.
Some extra changes snuck into my commit; they'll probably be reviewed
and committed to Subversion eventually, but were not part of the fix
for WaitForSingleObject on thread handles.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30844 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 11:14:07 +00:00
sesse 61f351dc90 Support thread handles in WaitForSingleObject.
Some codecs need this for clean shutdown (as opposed to a crash); we don't 
really support timed wait since POSIX doesn't, but it doesn't seem necessary.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30843 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 11:11:47 +00:00
benoit de6f717b09 Cosmetics: fix vertical alignment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30842 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 08:41:35 +00:00
benoit 11d73c297d libswscale: Extend the unaccelerated path of the unscaled yuv2rgb special
converter with support for rgb444 output format.
Patch by Janusz Krzysztofik jkrzyszt chez tis icnet pl


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30841 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 08:32:54 +00:00
cehoyos 487b94aa88 Support BGR555, BGR565, RGB555 and RGB565 foreign endian output in
libswscale.

Patch by Alexis Ballier, alexis D ballier A gmail


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30840 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 16:57:04 +00:00
diego ceb90b2c19 Remove NUT specification stubs.
They have been obsolete for a long time and point nowhere.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30839 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:58:09 +00:00
diego d8c9cd8bbd Run script with /bin/sh instead of bash.
There is nothing bash-specific in this shell script.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30838 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:57:21 +00:00
sesse 5fb74d581f Make emulated Win32 critical sections thread safe.
Earlier, cs->locked was accessed outside the mutex to get around
the problem that default pthread mutexes are not recursive
(ie., you cannot do a double-lock from the same thread), causing
a thread-safety problem, as both detected by Helgrind and showing
up in some multithreaded codecs.

The ideal solution here would be to simply use recursive pthread
mutexes, but there were concerns about reduced debuggability and
possibly portability. Thus, instead, rewrite the critical sections
to be a simple lock count (with owner) protected by a regular mutex.
Whenever a thread wants to enter the critical section and lock_count
is not 0, it sleeps on a special event that tells it when the
critical section is available.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30837 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:57:08 +00:00
diego c62d2888ab cosmetics: Use consistent if expression syntax.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30836 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:56:34 +00:00
diego 64513539c1 Use $() syntax instead of backticks, it is easier to nest.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30835 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:55:35 +00:00
diego d19a8ba6d4 Clarify that ssh is not required for committing to MPlayer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30834 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:53:56 +00:00
diego d36623c019 Update URL for Subversion homepage.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30833 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:45:32 +00:00
sesse f32e92b849 Fix crashes in CreatePalette by fixing the LOGPALETTE struct.
CreatePalette had problems for me, and looking at the code it was quite
obvious why; someone had reversed the order of the two elements of the
LOGPALETTE struct, causing it to allocate and copy a bogus amount of memory.
Why on earth anybody would want to do that is beyond me; whoever did it even
left a comment, but it wasn't very helpful, as it crashed nevertheless. :-)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30832 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:31:54 +00:00
sesse c6fb73d6b1 Fix manual reset behavior of Win32 events.
Events have a “reset” member that specify if they flag is automatically                                   
set back on read/wait. However, this was populated by bManualReset, so the                                
flag was inverted and once an event was set, it would forever be counted                                  
as so. Fixed by inverting the flag.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30831 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:28:02 +00:00
sesse 84bcc5642a Fix return values of WaitForSingleObject when checking an event.
These were simply inverted compared to what they should be.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30830 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:23:52 +00:00
komh b10a6917f4 Define HAVE_SETMODE conditionally, and use it in stream/stream_file.c instead
of platform specific predefined macros.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30829 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 14:46:44 +00:00
komh 66278a55ec 1. Move the macros for priority classes for OS/2 from priority.c to osdep.h
2. Define SetPriorityClass() and GetCurrentProcess() in osdep.h
3. Include osdep.h in priority.c

This removes OS2-platform check in priority.c



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30828 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 12:55:30 +00:00
stefano 6cf92cd32a Revert r30825, it was not supposed to be committed.
127.32L to me, beware when using git svn dcommit for committing stuff
to svn...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30827 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 01:02:24 +00:00
stefano ff232e1f6f Fill the r, g, b values used for computing the c->pal_yuv table in the
case where the source format is PIX_FMT_GRAY8.

This is required as PIX_FMT_GRAY8 has been declared as a paletted
format in FFmpeg r22191, fix GRAY8 -> RGB conversion.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30826 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 00:31:13 +00:00
stefano a2a9a53d3f Make swscale-test take in input the name of the input and the output
format.

Make swscale-test only perform the test from the input to the output
format rather than perform all.

Also implement swscale-test-all.sh, for performing all the tests.

Improve flexibility of the swscale-test tool, this way is simpler to
perform only a subset of tests.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30825 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 00:31:10 +00:00
reimar 57f4448e7a Partially revert r30645, the final output format is determined by
mpcodecs_config_vo so we need to query it afterwards.
Still try to set a more sensible, codec-dependant preferred format even
though it is currently ignored.
Fixes bug #1659, based on patch by Andrew Wason [rectalogic rectalogic com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30824 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 21:32:31 +00:00
reimar baae4d1add Save the new width and height earlier so that e.g. -geometry 30x30-50-50
gives the correct behaviour - before placement would depend on the
original movie size instead of the one scaled according to -geometry.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30823 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 21:01:57 +00:00
reimar 90188f0e5f Add support for specifying window position relative to right and bottom
screen borders with -geometry.
Based on patch by Melchior FRANZ [melchior franz gmail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30822 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 20:57:56 +00:00
reimar 0833aaa64d Simplify sscanf format strings and get rid of useless percent variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30821 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 20:36:35 +00:00
reimar 55b3c6f090 Avoid very deep indentation level and RESET_GEOMETRY macro in -geometry
parsing.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30820 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 20:24:46 +00:00
komh 9beeeb1a9e Add a VCD support for OS/2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30819 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 14:32:29 +00:00
diego c106fe7751 Drop support for old-style DVB code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-02 19:57:17 +00:00
rectalogic d83eddc2a8 Remove RTSP_MUXER from libavmuxers to fix compilation with --disable-network
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30817 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-02 17:18:55 +00:00
diego e27159e748 Add CONFIG_LSP to config.h for libavcodec compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30816 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-02 16:29:21 +00:00
reimar be23797ee7 Remove unused and useless define.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30815 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 21:09:17 +00:00
reimar 3fa6717fb9 Fix memleak due to strdup'd filename not being freed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30814 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 20:38:33 +00:00
reimar cd4aa2aa30 Move functions into proper order to avoid extra declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30813 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 20:33:47 +00:00
reimar 3ed38bacc4 Deduplicate code to set stream start_pos/end_pos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30812 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 20:31:56 +00:00
reimar 4b7c452ce8 Set stream->pos correctly after seeking to a VCD title.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30811 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 20:22:18 +00:00
reimar ea139fadc1 Ensure that cue_current_pos.track is not set to an invalid value after
attempting to seek to e.g. track 0.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30810 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 20:20:13 +00:00
reimar 20fcc5c6ef Fix off-by-one error in chapter<->VCD track conversion.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30809 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 20:11:11 +00:00
reimar 4464a64ff7 Fix cue_read_toc_entry to also reject negative track numbers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30808 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 20:07:37 +00:00
reimar 686565165f Implement cue:// track switching via chapter forward/backward like for audio CDs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30807 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 19:59:54 +00:00
reimar 592af7cd2c Fix cue_vcd_get_track_end to not change the current position.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30806 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 19:57:42 +00:00
reimar f2740450d3 Avoid fd_bin and fd_cue global variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30805 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 19:35:18 +00:00
reimar 3fc8335a86 Avoid a global variable and a strcpy.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30804 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 19:25:52 +00:00
reimar 2b91c7f044 Reindent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30803 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 19:21:59 +00:00
reimar 2a6755e10d Avoid code duplication and excessively deep nesting in cue_find_bin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30802 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 19:20:32 +00:00
reimar 7d48f09b39 Use sizeof instead of hardcoded size.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30801 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-01 18:57:24 +00:00
cehoyos 2acd36c48e Documentation: Add linebreak and try to be less ambiguous.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30800 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 17:39:30 +00:00