summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30065Uoti Urpala2009-12-2911-52/+65
|\
| * Rename GL_* defines to CONFIG_GL_*reimar2009-12-195-31/+31
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30065 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add x11_common as dependency for OpenGL with X11 backend.reimar2009-12-191-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30064 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make the check for X11 and WIN32 backends for OpenGL separate.reimar2009-12-195-13/+24
| | | | | | | | | | | | This fixes compilation on Windows with X11 but no GLX available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30063 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a missing const, fixes a compiler warning.reimar2009-12-181-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30062 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow pulseaudio to restore the previous volume on init instead of forcing toreimar2009-12-181-4/+1
| | | | | | | | | | | | | | | | full volume. The old behaviour can be restored by using -volume 100. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30061 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of global volume variable, it is only used for temporary values.reimar2009-12-181-5/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30060 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use on-stack subtitle struct for temporary storage for passing subtitles onreimar2009-12-181-5/+6
| | | | | | | | | | | | | | | | | | | | for rendering by libass. This avoids mangling the static subtitle struct that is supposed to contain the subtitles that will actually be displayed and it also minimally reduces memory usage by freeing the subtitle lines again as early as possible. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30059 b3059339-0415-0410-9bf9-f77b7e298cf2
| * synced to r30044ptt2009-12-181-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30058 b3059339-0415-0410-9bf9-f77b7e298cf2
| * divided a line in two, was too longptt2009-12-181-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30057 b3059339-0415-0410-9bf9-f77b7e298cf2
| * synced with r30043ptt2009-12-181-4/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30056 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux_mkv.c, ebml.c: Reformat to K&R styleUoti Urpala2009-12-292-2441/+2228
| |
* | ao_alsa: Reinitialize parameters properly when reopeningUoti Urpala2009-12-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | ao_alsa used static variables to define the parameter values for snd_pcm_hw_params_set_buffer_time_near() and snd_pcm_hw_params_set_periods_near(). The variables were non-const and the desired value was only set in the initializer. The ALSA functions in question take a pointer argument to an in/out parameter which is modified to reflect the value actually used. As a result, when playing multiple files or otherwise reinitializing the AO the later instances could use values that had been modified by earlier calls. Change the code to always always use the same default values.
* | audio: Remove fixed decode_audio() return size limit (MAX_OUTBURST)Uoti Urpala2009-12-295-56/+45
| | | | | | | | | | | | | | | | | | | | | | | | A couple of months ago MPlayer's ALSA driver started rounding the amount of input data it was willing to accept in one call down to an integer multiple of the value it set in ao_data.outburst. In some configurations it was possible for this value to exceed the 64 KiB limit on the amount MPlayer was willing to write in a single call to the AO. As a result ao_alsa accepted 0 bytes in each play() call and audio playback failed. Fix this by removing the fixed 64 KiB limit on the amount of audio sent to AO at once; the limit was mostly a remnant of older code anyway.
* | cosmetics: Revert old dec_audio.c code uglificationUoti Urpala2009-12-281-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert 3 old code uglification changes that were done with the excuse of gcc-2.95 support. The last reverted change was a fix to a bug introduced in the middle change. Revert "10l, len may change after initialization time" This reverts commit ae9db277c7dae6350cab22d9c57d78cc4684aa9c. Revert "fix declaration after statement, take 2" This reverts commit 4bceedee9305e1ebf53c598eb863aac4153e67d5. Revert "fix declaration after statement" This reverts commit aef0374c1cef269d65b8783dae8d33ee45a1f976.
* | subtitles: Fix double text with libass rendered plaintext subsUoti Urpala2009-12-181-2/+3
| | | | | | | | | | | | | | | | | | | | When using libass to render plaintext (non-SSA/ASS) subtitles the code in update_subtitles() still called set_osd_subtitle() in one case, causing the global vo_sub variable containing non-libass subtitles to be set. Under some circumstances this resulted in both a libass-rendered and non-libass-rendered version of the same subtitle appearing on screen. Fix by running the subtitle clearing code (which called set_osd_subtitle) only when libass is not used.
* | Merge svn changes up to r30055Uoti Urpala2009-12-1840-614/+746
|\|
| * Synced with help_mp-en.h r30044jrash2009-12-181-46/+46
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30055 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 r30053jrash2009-12-181-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30054 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support R210 uncompressed 10 bit RGB codec.cehoyos2009-12-171-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30053 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not modify priv->idx_pos when regenerating the index, use a localreimar2009-12-171-5/+5
| | | | | | | | | | | | | | | | | | variable instead. should fix seeking after starting playback with -force-idx broken by r29914. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30052 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: Reindent after r30050.cehoyos2009-12-171-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30051 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly increase hardware decoding performance by always using morecehoyos2009-12-171-7/+0
| | | | | | | | | | | | | | | | | | | | video surfaces than absolutely necessary. I will revert if somebody reports real-world resource issues introduced by this commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30050 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: reindentadrian2009-12-171-22/+22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30049 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Improve VDPAU render performance by increasing number of output surfaces.cehoyos2009-12-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30048 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make vidix/pci_db2c.awk executable.diego2009-12-161-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30047 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The fontconfig check added in r30044 wasn't safe. This makes it more robust.adrian2009-12-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30046 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify the evaluation of the lang-def template:diego2009-12-161-8/+8
| | | | | | | | | | | | | | | | Use the language variable directly in the template instead of passing the language variable as a parameter to $(call). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30045 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix a crash when fontconfig is unable to select a font. e.g. if no config ↵adrian2009-12-162-2/+8
| | | | | | | | | | | | directory could be found. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30044 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for -geometry to corevideo.adrian2009-12-152-9/+13
| | | | | | | | | | | | | | Based on a patch by Tim Wojtulewicz (timwoj at ieee dot org). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30043 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add -xineramascreen support to corevideo vo. Still prefer corevideo's own ↵adrian2009-12-152-2/+5
| | | | | | | | | | | | device_id parameter if it's set. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30042 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add spdif example from beandogcompn2009-12-151-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30041 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Filter list of missing source files so that it only contains nonexisting files.diego2009-12-141-2/+2
| | | | | | | | | | | | | | Thus those files can be symlinked directly without testing if they exist. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30040 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.diego2009-12-142-2/+13
| | | | | | | | | | | | | | patch by Peter Hjalmarsson, xake rymdraket net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30039 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use $(notdir ) to filter out path prefixes instead of reinventing it poorly.diego2009-12-141-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30038 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid hackish shell loop to symlink missing XML source files.diego2009-12-141-3/+1
| | | | | | | | | | | | | | Instead, employ make syntax to generate the shell command arguments. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30037 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Globally remove main.xml from SYMLINKS_DEPS. It should never be symlinked.diego2009-12-141-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30036 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reuse SYMLINKS_DEPS variable in the symlink targets.diego2009-12-141-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30035 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify shell command to symlink missing translated source files.diego2009-12-141-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30034 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Ignore errors from failing rm commands in clean targets.diego2009-12-141-4/+4
| | | | | | | | | | | | | | This is also the policy we have in the top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30033 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not ignore errors from mkdir invocations.diego2009-12-141-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30032 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The general xmllint target should only check configured languages.diego2009-12-141-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30031 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Improve declaration of phony targets.diego2009-12-141-1/+2
| | | | | | | | | | | | | | This prevents configure from being rerun all the time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30030 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factorize dependencies of language-specific HTML generation targets.diego2009-12-141-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30029 b3059339-0415-0410-9bf9-f77b7e298cf2
| * spelling cosmeticsdiego2009-12-141-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30028 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless dependency on xmllint.sh from phony xmllint target.diego2009-12-141-1/+1
| | | | | | | | | | | | | | The individual language targets carry that dependency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30027 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop pointless dependencies of the phony targets html-chunked and html-single.diego2009-12-141-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30026 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix dependencies of html-chunked and html-single targets.diego2009-12-141-3/+3
| | | | | | | | | | | | | | All the files generated by configure are required. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30025 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Exploit one more opportunity to make use of the CONFIGURE_GENERATED variable.diego2009-12-141-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30024 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factorize all components generated by configure into a variable.diego2009-12-141-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30023 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove outdated comment about build system behavior.diego2009-12-141-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30022 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename XSL_DEPS variable to SINGLE_XSL_DEPS for consistency.diego2009-12-141-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30021 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop support for per-language XSL stylesheets.diego2009-12-142-57/+2
| | | | | | | | | | | | | | The feature was never properly used and provides little benefit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30020 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless Polish stylesheet; it provides no real benefit.diego2009-12-143-31/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30019 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop support for per-language stylesheets.diego2009-12-1412-39/+2
| | | | | | | | | | | | | | In all these years nobody ever used this feature. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30018 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Unconditionally symlink documentation files missing from a translation.diego2009-12-1412-37/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30017 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use variable for HTML stylesheet so individual languages can use their own.diego2009-12-141-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30016 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factorize stylesheet installation into its own target.diego2009-12-141-4/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30015 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Construct monolithic targets with the HTMLDIR instead of the HTMLFILE variable.diego2009-12-1412-23/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30014 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factorize generating the list of all main.xml files.diego2009-12-131-2/+4
| | | | | | | |