Commit Graph

32219 Commits

Author SHA1 Message Date
reimar 431183c03f options: Also allow setting msglevel for MSGT_FIXME
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31885 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:48 +02:00
reimar 3f4dd2f833 dvdcss: Fix typo in documentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31884 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 2fadc18008 dvdcss: Handle failing ioctls more gracefully
Also set b_scrambled and b_ioctls in the dvdcss_test function
instead of both in and outside it and in case of b_scrambled
forgetting to set it half of the time.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31883 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 21a3550663 dvdcss: Fix DVD playback with region-free drives
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31881 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego d1a3dd5cad configure: Default to -O2 optimization level for the clang compiler
patch by Rowan James, rowanj phere net

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31880 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego da1135a96d stream_dvb.c: avoid compiler warning by adding initialization
Initialize conf_file variable to kill the warning:
stream/stream_dvb.c:755: warning: 'conf_file' may be used uninitialized in this function
Blessed and suggested by Nico Sabbi.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31877 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego 900ca4cb3e demux_ts.c: avoid compiler warning by adding initialization
Initialize frame_length variable to zero to avoid the warning:
libmpdemux/demux_ts.c:669: warning: 'frame_length' may be used uninitialized in this function

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31874 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
compn 7d7f3345e7 codecs.conf: add binary expression codec for fourcc MTS2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31872 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 4bf28980f9 ao_mpegpes: Properly close file on error or uninit
Avoids failing with "device busy" e.g. when reinitializing the ao.
Fixes bug #1746.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31871 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar ff1da0cb35 ao_mpegpes.c: minor simplification
Avoid code duplication, use the generated file name instead of
generating it twice.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31870 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
compn 0c9034f030 loader/win32.c: remove sys/timeb.h include
It is obsolete and breaks compilation with new gcc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31868 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
jrash 27fcef8df1 DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31814
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31867 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 9e6b34e040 configure: add header_check_broken, use for cdio
Make the sys/cdio.h header test work by explictly including
sys/types.h before.
Broken headers are a Solaris and BSD tradition, hoping
for them to get their act together is hopeless, so we
work around it (for now at least).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31855 b3059339-0415-0410-9bf9-f77b7e298cf2

Add a special header_check_broken to be used for broken
system headers taht do not include all dependencies
and use it for the Solaris uscsi header.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31856 b3059339-0415-0410-9bf9-f77b7e298cf2

Use header_check_broken to simplify cdio.h check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31857 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego b1502bd15c DOCS/xml/README: improve
The package list for Debian systems is not specific to the Sarge release.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31841 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove instructions for installing XML/XSL packages from source.
This information is outside the scope of this README file.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31842 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego 3bbc42c43b DOCS/xml/configure: misc changes
Simplify xmllint test.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31836 b3059339-0415-0410-9bf9-f77b7e298cf2

cosmetics: Drop leading underscores from variable names.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31837 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unused variable fake_docbook_xsl.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31838 b3059339-0415-0410-9bf9-f77b7e298cf2

Adding XML entities for the English XML files to main.xml is enough.
The English version is the master and will always be complete.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31839 b3059339-0415-0410-9bf9-f77b7e298cf2

cosmetics: Use more compact "if .. then" shell syntax.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31840 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify adding --catalogs option to xsltproc/xmllint command line.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31843 b3059339-0415-0410-9bf9-f77b7e298cf2

Add an XML catalog search path that works for current macports systems.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31844 b3059339-0415-0410-9bf9-f77b7e298cf2

whitespace cosmetics: fix indentation

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31845 b3059339-0415-0410-9bf9-f77b7e298cf2

Skip searching for an xmllint command.
The xmllint target is separate from building the documentation; thus if xmllint
is not available, the xmllint targets can fail without further harm.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31846 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego a103afe7a4 DOCS/xml/en/documentation.xml: mark MPlayer as GPL v2 only
Almost all files are v2+, but there are some bits of v2 only code
left, so MPlayer as a whole is still v2 only.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31835 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
Gabrov 34cfcd33df DOCS/*/hu: synced with r31833
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31834 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
cehoyos d1ecb411b3 codecs.conf: Support FFmpeg's native AMR Narrowband decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31830 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 269d3df12c dvdnav: Support for image highlights for dvdnav menus.
Does not work 100% reliably and needs -sid 0.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31828 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 1ee113088f spudec.c: Remove useless end_col/end_row variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31827 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar cc6428a72c vo_corevideo: Move variable into the only function it's used in
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31826 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 2e6847a352 vo_corevideo: move mouse hiding to check_events
Move mouse hiding code to check_events, this allows mouse hiding
to continue to work with -idle -fixed-vo, after the video has
finished but the last frame is still displayed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31825 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 902417b999 vo_corevideo: Make the Quit menu entry work
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31824 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 5a1689d894 vo_corevideo: simplify check_events
Simplify check_events: avoid seemingly pointless untilDate argument.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31823 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar d612a71f39 vo_corevideo: change window-closing handling
Change window-closing handling so it works properly if the
KEY_CLOSE_WIN is rebound to e.g. skip to next file or not
bound at all.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31822 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego 6db1ac87fc DOCS/xml: updates
Drop one pointless subsectioning level from radio input chapter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31815 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove subsection that describes how to tweak CD/DVD drives.
It is getting outdated and outside the scope of MPlayer documentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31816 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove pointless and non-informative SDL section from video output chapter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31817 b3059339-0415-0410-9bf9-f77b7e298cf2

Drop one level of pointless subsectioning.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31818 b3059339-0415-0410-9bf9-f77b7e298cf2

Split TV chapter in two.
This avoids a chapter without content apart from the (sub)sections.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31819 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove MTRR section from video output chapter.
The information it contains should be irrelevant in 2010.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31820 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove graphics cards subsections from Xv section in video output chapter.
The information contained is very outdated.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31821 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego e01435b55e manpage: don't claim teletext keys would depend on build options
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31814 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar a13a629669 manpage: Fix wrong option name in input example
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31813 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 59524e7a3f vo_corevideo, vo_quartz: remove useless kQuitCmd
Remove kQuitCmd, it has no purpose or effect at all.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31811 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unused kQuitCmd from vo_quartz.
While just as useless as for corevideo, the "Quit"
menu item at least works through kHICommandQuit here.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31812 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 79662b6f19 vo_corevideo: indentation fixes
Cosmetics: indentation fixes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31808 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix indentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31810 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 465839a395 vo_corevideo: Avoid some code duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31809 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar f4f8c1f7e9 vo_corevideo: Simplify update_screen_info
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31806 b3059339-0415-0410-9bf9-f77b7e298cf2

Avoid some code duplication in update_screen_info.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31807 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 0a5ff5eef3 vo_corevideo: avoid dangerous casts
Declare variables with proper types to avoid dangerous pointer casts.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31805 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 5f5a12a939 vo_corevideo.m: remote useless parentheses and casts
Remove useless ().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31802 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove yet more useless ()

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31803 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove pointless casts.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31804 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 2fa911a6f5 vo_corevideo: Send KEY_CLOSE_WIN instead of KEY_ESC for quit
Send KEY_CLOSE_WIN instead of KEY_ESC when the user requested
corevideo to quit, KEY_ESC might have been rebound to something else.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31801 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 68200fa565 spudec.c: Slightly simplify rle decoding
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31799 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 599647ff8c spudec.c: Remove a useless condition check
It's already handled a few lines further down (the len == 0 check).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31798 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 63cc56045a spudec.c: Avoid useless malloc/frees
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31797 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unused variables.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31800 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 2b895d9349 command.c: Change cast to avoid a warning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31795 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 6ab9a83398 slave mode: Add stream_time_pos property
Patch by Paul Huwe [reicow yahoo com] with some modifications by me.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31794 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 37097806be spudec.c: Remove useless NULL checks before free()
Also set pointers to NULL after freeing.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31792 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar a5e9d3b56a spudec: Allocate memory for paletted image data separately
Use a separate allocation to avoid issues with e.g. the "cut" function.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31791 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 4533ea0d55 spudec: Slightly simplify dvd subtitle RLE decoding
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31790 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar af62b02a63 spudec: Share paletted -> gray/alpha conversion code
Also keep a copy of the raw rle-decoded data. Should simplify
implementing palette changes and the rle decoding code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31789 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar dd886133a9 spudec: Simplify creation of color/alpha map
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31788 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar cbe036312a vobsub: Only try to merge packets if we have an earlier one stored
Based on patch by 191919 [191919 gmail com].

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31787 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 7fe4aa9a3b vd_qtvideo: Some indentation fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31785 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 56599fe4a4 vd_qtvideo: generate a ImageDescription if not given
Generate a ImageDescription if none is passed neither via ImageDesc nor
extradata.
Makes the ProRes decoder work with -demuxer lavf.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31784 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
jrash 15365874f9 DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31769
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31774 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 7db422b384 manpage: mention -af stats in -af volume section for statistics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31769 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00