summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r31020Uoti Urpala2010-04-269-104/+168
|\
| * Remove unused functions.reimar2010-04-051-27/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31020 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Export VCD tracks as chapters, just like for cue:// URLs.reimar2010-04-051-0/+35
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31019 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,reimar2010-04-051-6/+10
| | | | | | | | | | | | | | not around MMX code etc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31018 b3059339-0415-0410-9bf9-f77b7e298cf2
| * VBlankActiveFunc is a pointer to a parameterless function; mark it as such.diego2010-04-051-1/+1
| | | | | | | | | | | | | | | | This fixes the warning: vidix/sis_vid.c:96: warning: function declaration isn't a prototype git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31017 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix RGB support for corevideo: corevideo can only supportreimar2010-04-051-8/+22
| | | | | | | | | | | | | | | | | | ARGB and BGRA, which depending on endianness matches only one of RGB32 and BGR32. Also add RGB24 support which works independent of endianness, git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31016 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable OSD also for BGR32, the code is the same as for RGB32.reimar2010-04-051-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31015 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Implement VOCTRL_DRAW_IMAGE instead of the deprecated draw_frame, avoidingreimar2010-04-051-10/+6
| | | | | | | | | | | | | | an extra memcpy in case of stride mismatch. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31014 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Check texture dimensions instead of internal format in max texturereimar2010-04-041-3/+3
| | | | | | | | | | | | | | | | | | size check to work around OS X ATI driver bugs: - does not keep format but use an equivalent one (1 becomes 0x8040). - does not set to 0 on failure but to 0x8018 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31013 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics/reindent.reimar2010-04-041-14/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31012 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid duplicating a condition.reimar2010-04-041-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31011 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print width before height,reimar2010-04-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31010 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix width/height mixup in error message.reimar2010-04-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31009 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove -O4 from FAAC check, it is in our standard CFLAGS already.diego2010-04-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31008 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Directly use CFLAGS for ASFLAGS instead of duplicating the variable content.diego2010-04-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31007 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factor out the YUV->RGB conversion auto-selection and alsoreimar2010-04-044-4/+18
| | | | | | | | | | | | | | | | enable auto-selection of ATI fragment shaders since they should do accurate conversions now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31006 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: prettyprint config.mak somewhatdiego2010-04-041-105/+106
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31005 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31004Uoti Urpala2010-04-2646-683/+825
|\|
| * Remove no longer necessary CONFIG_SWSCALE from config.h/config.mak.diego2010-04-041-3/+0
| | | | | | | | | | | | | | FFmpeg now builds with the software scaler enabled by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31004 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark parameterless function declarations as (void). Fixes the warnings:diego2010-04-041-0/+2
| | | | | | | | | | | | | | | | loader/wine/msacm.h:693: warning: function declaration isn't a prototype loader/wine/msacm.h:901: warning: function declaration isn't a prototype git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31003 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark input-related m_option_t arrays as const.diego2010-04-041-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31002 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark vf_size_preset_fields m_option_t array as const.diego2010-04-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31001 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark muxer-related m_option_t arrays as const.diego2010-04-042-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31000 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark cfg_fields m_option_t array as const.diego2010-04-048-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30999 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark dxr2_opts array as const.diego2010-04-042-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30998 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark encoder-related m_option_t struct arrays as const.diego2010-04-049-18/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30997 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert marking m_option struct member as const.diego2010-04-041-1/+1
| | | | | | | | | | | | | | It is used for non-const things, so the original change was wrong. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30996 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Share more code between the two ATI fragment shader YUV to RGBreimar2010-04-041-69/+87
| | | | | | | | | | | | | | | | conversion methods and extend them to support more accurate conversion (though at the cost of some speed). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30995 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try to detect and work around broken glXGetProcAddress on atreimar2010-04-031-0/+6
| | | | | | | | | | | | | | least PPC OS X 10.4. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30994 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Implement OpenGL-based YUV to RGB version for Radeon 9200 classreimar2010-04-032-0/+55
| | | | | | | | | | | | | | cards on OS X. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30993 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove commented-out #include of a non-existing file.diego2010-04-031-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30992 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a header for x264enc_set_param() instead of forward declaring it.diego2010-04-033-3/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless #ifdef CONFIG_LIBAVCODEC preprocessor check.diego2010-04-031-2/+0
| | | | | | | | | | | | | | The file is only compiled if that condition is true. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30990 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark m_option struct member as const.diego2010-04-031-1/+1
| | | | | | | | | | | | | | | | This fixes many warnings similar to: cfg-mplayer.h:368: warning: initialization discards qualifiers from pointer target type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30989 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Indentation fix.reimar2010-04-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30988 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add mpgl prefix to all OpenGL-related function pointers.reimar2010-04-035-572/+572
| | | | | | | | | | | | | | | | | | This is necessary because at least the GetString symbol causes clashes on PPC OSX 10.4, causing -vo gl to always crash. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30987 b3059339-0415-0410-9bf9-f77b7e298cf2
| * dont mention base64 about sending attachments.attila2010-04-021-2/+2
| | | | | | | | | | | | | | | | | | this may (and has) confused people, beside that 99.9% of all MUA will do the right thing here anyways. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30986 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: Fix indentation.cehoyos2010-04-021-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30985 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not try -march=native for icc.cehoyos2010-04-021-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30984 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change type to uint8_t to avoid checks depending on char signedness.reimar2010-04-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30983 b3059339-0415-0410-9bf9-f77b7e298cf2
| * updated example line for encoding to psp (acodec faac is now libfaac)ptt2010-04-019-26/+26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30982 b3059339-0415-0410-9bf9-f77b7e298cf2
| * updated table of libavcodec's audio codecsptt2010-04-011-20/+52
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30981 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Sanitize ICY metadata a bit before printing it.reimar2010-03-311-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30980 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make audio switching with AVI demuxer chose the first audio streamreimar2010-03-311-1/+1
| | | | | | | | | | | | | | if audio is disabled instead of ignoring the request. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30979 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace some "m" constraints by MANGLE to avoid issues with some compilers notreimar2010-03-311-106/+43
| | | | | | | | | | | | | | being able to compile it and deduplicate the code at the same time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30978 b3059339-0415-0410-9bf9-f77b7e298cf2
| * rename eatgv -> ffeatgv, lpcm -> fflpcmattila2010-03-311-2/+2
| | | | | | | | | | | | | | | | | | for consitently naming all ffmpeg codecs requested by compn git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30977 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add HAVE_STRERROR_R definition for FFmpeg to config.h.diego2010-03-281-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30976 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use (void) instead of () to indicate a parameterless function, fixes:diego2010-03-281-1/+1
| | | | | | | | | | | | | | libvo/vo_xvmc.c:123: warning: function declaration isn't a prototype git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30975 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn changes up to r30974Uoti Urpala2010-04-260-0/+0
|\| | | | | | | FFmpeg build stuff.
| * Add definition of CONFIG_LIBRTMP to config.h for FFmpeg.diego2010-03-281-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30974 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after librtmp support in FFmpeg.reimar2010-03-281-0/+1
| | | | | | | | | | | | | | Should be replaced by a proper configure check for librtmp later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30973 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30972Uoti Urpala2010-04-263-21/+29
|\|
| * Fix crash with incomplete yuv2 frames.reimar2010-03-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30972 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Leave disabling SSE to the check_os_katmai_support always regardless of OS,reimar2010-03-271-8/+0
| | | | | | | | | | | | | | | | it can already handle all cases, will always print a proper warning and probably fixes SSE being disabled on x86_64 Solaris systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30971 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support concatenated YUV4MPEG files.reimar2010-03-271-11/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30970 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use calloc instead of malloc+memsetreimar2010-03-271-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30969 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn change r30968Uoti Urpala2010-04-260-0/+0
|\| | | | | | | Already done long ago in git.
| * Add const to some video_out extern declarations to match their definitions.reimar2010-03-271-45/+45
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30968 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30967Uoti Urpala2010-04-2649-361/+258
|\|
| * Mark some more LIBVO_EXTERN declarations as const where possible.reimar2010-03-274-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30967 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, fix frametime calculation for MPEG-2 files with frame rate extension.reimar2010-03-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30966 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libswscale: Relicense almost all x86 assembler optimizations as LGPL.diego2010-03-275-74/+59
| | | | | | | | | | | | | | | | This is of course done with permissions from the authors. The only GPL component left are MMX optimizations for YUV to RGB conversion. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30965 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Refactor OS X foreground process setting into a separate function.diego2010-03-264-38/+26