summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30104Uoti Urpala2009-12-3012-287/+393
|\ | | | | | | Ignore the broken correct-pts change in r30100.
| * create CDGR fourcc in mp_taglist and add ffcdgraphics to codecs.confcompn2009-12-242-0/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30104 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Register lavc Aura 2 decoderkostya2009-12-231-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30103 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Register lavc Aura decoderkostya2009-12-231-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30102 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow passing variants of "mingw32" as system name to --target. This ensuresdiego2009-12-231-1/+1
| | | | | | | | | | | | | | backwards compatibility after switching from "mingw32msvc" to "mingw32". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30101 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not use correct-pts by default for demuxer lavf, it breaks all PAFF files.cehoyos2009-12-221-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30100 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove parameters no longer used in h[yc]scale().ramiro2009-12-211-10/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30099 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move fast bilinear scaler code to the existing h[yc]scale_fast() functions.ramiro2009-12-212-196/+196
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30098 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename function pointers used to convert from the input pixel format to theramiro2009-12-212-55/+55
| | | | | | | | | | | | | | intermediate YV12 to a more descriptive name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30097 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Check if chroma horizontal scaler is needed in sws_init_swScale().ramiro2009-12-212-4/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30096 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused fields from SwsContext.ramiro2009-12-211-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30095 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not auto-generate the C code to handle PCI vendor and device names.diego2009-12-203-46/+60
| | | | | | | | | | | | | | This part of the code does not change so there is no point in generating it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30094 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync w/r29731gpoirier2009-12-201-10/+44
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30093 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused debugging output about total number of printed lines.diego2009-12-201-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30092 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Employ slightly better variable names for output files.diego2009-12-201-48/+48
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30091 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Eliminate completely pointless print_includes function.diego2009-12-201-7/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30090 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use "mingw32" instead of "mingw32msvc" as system name for MinGW with --target.diego2009-12-201-1/+1
| | | | | | | | | | | | | | The former is the official name used by the MinGW project. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30089 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not autogenerate vidix/pci_names.h.diego2009-12-203-22/+39
| | | | | | | | | | | | | | Its contents is always the same, so there is no point in generating it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30088 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Indentation.ramiro2009-12-202-14/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30087 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Indent.ramiro2009-12-201-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30086 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set fast_bilinear functions in sws_init_swScale().ramiro2009-12-201-12/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30085 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless return statements from functions that return nothing.diego2009-12-201-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30084 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move code to write multiple inclusion guards to generated files into functions.diego2009-12-201-15/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30083 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set horizontal scaler's range conversion in context in sws_init_swScale().ramiro2009-12-202-28/+50
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30082 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set horizontal scaler's src offsets in context in sws_init_swScale().ramiro2009-12-202-19/+24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30081 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Use more consistent formatting style for generated files.diego2009-12-201-36/+29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30080 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Use a consistent formattting style; tabs to spaces.diego2009-12-201-203/+196
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30079 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change %f to %e in generated fragment programs to avoid losing precision ↵reimar2009-12-201-26/+26
| | | | | | | | | | | | unnecessarily. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30078 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Run vidix/pci_db2c.awk directly instead of passing it to awk.diego2009-12-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30077 b3059339-0415-0410-9bf9-f77b7e298cf2
| * VP6F has to be flipped for binary decoder.cehoyos2009-12-201-1/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30076 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly improve vo_gl suboption documentation.reimar2009-12-192-5/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30075 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Define GL_GENERATE_MIPMAP ourselves if necessary.reimar2009-12-191-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30074 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation with internal ASS when no ass header is installed system-wide.reimar2009-12-191-1/+1
| | | | | | | | | | | | | | Patch by Erik Auerswald [auerswal unix-ag.uni-kl.de] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30073 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for auto-generating mipmaps in vo_gl, should easereimar2009-12-191-3/+15
| | | | | | | | | | | | | | implementing anything that needs blur filters with large support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30072 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make -vo gl:customprog also work with RGB input (obviously those need to bereimar2009-12-191-17/+15
| | | | | | | | | | | | | | special RGB fragment programs). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30071 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix a broken indentation.reimar2009-12-191-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30070 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable running fragment programs with YUV_CONVERSION_NONEreimar2009-12-191-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30069 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30068 (skip libass changes)Uoti Urpala2009-12-300-0/+0
|\| | | | | | | | | | | Mark inferior external libass support implementation from svn merged with "-s ours" (no actual changes to the tree). This tree already contains a better implementation.
| * Make ass_mp.h use the system-libass headers when the internal one is disabled.reimar2009-12-192-1/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30068 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Never include ass.h and ass_types.h directly, use ass_mp.h instead.reimar2009-12-193-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30067 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Experimental support for external libass.reimar2009-12-193-4/+15
| | | | | | | | | | | | | | So far probably only works with the libass from Ubuntu 9.10 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30066 b3059339-0415-0410-9bf9-f77b7e298cf2
* | 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
| |