summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28087Uoti Urpala2008-12-04119-693/+786
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Restore two mistakenly removed 'extern' keywords.diego2008-12-031-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28087 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow mp2 in mov.cehoyos2008-12-031-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28086 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of pointless 'extern' keywords.diego2008-12-03109-511/+510
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add bunch of fourccs and updates fromcompn2008-12-031-3/+30
| | | | | | | | | | | | | | http://tranquillity.ath.cx/uncommon_video_codecs_final.txt git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28084 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused declarations and references to vo_draw_text_osd(),diego2008-12-033-16/+1
| | | | | | | | | | | | | | vo_draw_text_progbar(), vo_draw_text_sub(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28083 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Delete unnecessary 'extern' keywords.diego2008-12-033-31/+31
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28082 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics in test programsdiego2008-12-031-22/+22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28081 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Treat video output objects the same as everything else in the build system,diego2008-12-032-51/+76
| | | | | | | | | | | | | | | | i.e. have lines that conditionally enable each in the Makefile and corresponding variables set from configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28080 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: consistent CONFIG_PNM definitiondiego2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28079 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add FFDS fourcccompn2008-12-031-0/+2
| | | | | | | | | | | | | | | | fixes FFDS avi files from this list: http://tranquillity.ath.cx/uncommon_video_codecs_final.txt git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28078 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename ZORAN Makefile variable to ZR for consistency.diego2008-12-032-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28077 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix indentation.reimar2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28076 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Treat audio output objects the same as everything else in the build system,diego2008-12-032-24/+34
| | | | | | | | | | | | | | | | i.e. have lines that conditionally enable each in the Makefile and corresponding variables set from configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28075 b3059339-0415-0410-9bf9-f77b7e298cf2
| * More robust w32 -wid size handlingreimar2008-12-031-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28074 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindent after previous commitreimar2008-12-031-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28073 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not override the vo_dwidth/vo_dheight values in vo_w32_configreimar2008-12-031-0/+3
| | | | | | | | | | | | | | in -wid mode because we ignore the requested size in that case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28072 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync w/r28056gpoirier2008-12-031-2/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28071 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics, whitespace and "... == NULL" to "!..."reimar2008-12-031-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28070 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Some whitespace and () cosmeticsreimar2008-12-031-17/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28069 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Pass "-f macho" to yasm when enabling YASM support on a 32-bits machine asgpoirier2008-12-031-1/+1
| | | | | | | | | | | | | | | | | | libavcodec/i386/x86inc.asm checks that __OUTPUT_FORMAT__ is 'macho' in 32-bits mode, not 'macho32'. This is a workaround until FFmpeg code is fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28068 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, actually put the PTHREAD_CACHE define into config.hreimar2008-12-021-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28067 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print ID_EXIT and exit reason message in identify mode when exiting.reimar2008-12-023-23/+44
| | | | | | | | | | | | | | Patch by rvm [rvm3000 ya com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28066 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux_rtp.cpp: Add missing #includeUoti Urpala2008-12-021-0/+1
| |
* | demux_rtp.cpp: Fix compilation issuesUoti Urpala2008-12-021-3/+3
| | | | | | | | This file hadn't been updated after some API changes.
* | Makefile, codec-cfg.c: Don't use EXTRA_INC flags for codec-cfg compileUoti Urpala2008-12-022-4/+6
| | | | | | | | | | | | | | | | codec-cfg runs on the host system but EXTRA_INC can have target system paths. The EXTRA_INC was added there for shared libavutil support. Copy the one #define codec-cfg.c needs from libmpdemux/aviheader.h (which in turn needed libavutil) instead of including the header, and drop the EXTRA_INC flags.
* | w32_common.c, vo_direct3d.c: Fix Windows compilation issuesUoti Urpala2008-12-022-3/+3
| | | | | | | | | | | | In w32_common.c the special "old_vo_defines.h" header was included too late. vo_direct3d.c was copied from svn without fixing the type of the control() function.
* | configure: Define HAVE_BSWAP and HAVE_FAST_64BIT for FFmpegUoti Urpala2008-12-021-1/+8
| | | | | | | | | | | | Set BSWAP unconditionally on x86/AMD64 (it should be available on anything newer than a 386). HAVE_FAST_64BIT could probably be set for more archs than this commit sets it for.
* | Merge svn changes up to r28065Uoti Urpala2008-12-0217-231/+1031
|\|
| * Remove resize_d3d call from render_d3d_frame that was made uselessreimar2008-12-021-2/+0
| | | | | | | | | | | | | | | | | | by previous commit. If this is necessary e.g. to prevent flicker while resizing, check_events should be called instead or even better the functionality be moved to some higher layer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28065 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, do not call check_events from resize_d3d since there should bereimar2008-12-021-3/+0
| | | | | | | | | | | | | | | | no reason to do it and it might call resize_d3d again which makes it hard to guarantee that it works correctly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28064 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: Remove unnecessary ()reimar2008-12-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28063 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Consistency cosmetics: do not compare against NULL in ifsreimar2008-12-021-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28062 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: remove spaces before argument (reimar2008-12-021-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28061 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reorganize Direct3D initialization code.reimar2008-12-021-51/+150
| | | | | | | | | | | | | | Patch by Georgi Petrov [gogothebee gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28060 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_direct3d.o depends on w32_common.o.diego2008-12-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28059 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove commented-out duplicate declarations.diego2008-12-021-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28058 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused declarations.diego2008-12-021-15/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28057 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a note about some known issues with -vo sdlreimar2008-12-011-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28056 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove a lot of completely pointless mp_msg_test calls.reimar2008-12-011-53/+26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28055 b3059339-0415-0410-9bf9-f77b7e298cf2
| * FFmpeg now has RV40 decoderkostya2008-12-011-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28054 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use standard unsigned long type instead of u_long.diego2008-11-301-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28053 b3059339-0415-0410-9bf9-f77b7e298cf2
| * MNG demuxer by Stefan Schuermans, stefan blinkenarea orgdiego2008-11-307-1/+662
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28052 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmeticsdiego2008-11-301-2/+38
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28051 b3059339-0415-0410-9bf9-f77b7e298cf2
| * use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>nplourde2008-11-301-17/+32
| | | | | | | | | | | | | | | | | | Original thread: date: Sun, Oct 12, 2008 at 10:32 PM subject: [MPlayer-dev-eng] [PATCH] vo_macosx: use mmap instead of shmat for MPlayerOSX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28050 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Correct detection of SSSE3 and SSE4a feature bits.zuxy2008-11-301-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28049 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move PTHREAD_CACHE define logic to configure.reimar2008-11-282-4/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28048 b3059339-0415-0410-9bf9-f77b7e298cf2
| * misc mplayer fixescompn2008-11-281-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28047 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix cross-compilation: autodetect correct nm toolreimar2008-11-281-1/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28046 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: prettyprinting and indentationdiego2008-11-281-77/+81
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28045 b3059339-0415-0410-9bf9-f77b7e298cf2
| * factorize mouse hiding and screensaver disabling codegpoirier2008-11-272-10/+11
| | | | | | | | | | | | | | | | | | | | Based on the patch posted in thread: from Gregor Riepl %onitake A gmail P com% date: Wed, Oct 29, 2008 at 7:26 PM subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28044 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28043Uoti Urpala2008-11-263-3/+12
|\|
| * configure: Move AANDCT config.mak entry and add config.h #definesuau2008-11-261-1/+3
| | | | | | | | | | | | | | | | Move the config.mak "CONFIG_AANDCT=yes" line to where other similar features are, and add missing CONFIG_AANDCT and ENABLE_AANDCT #defines to config.h (though current FFmpeg code works without them). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28043 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after FFmpeg r15940reimar2008-11-261-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28042 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use D3DFMT_ constants where possible instead of MAKEFOURCCreimar2008-11-261-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28041 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for RGB formats to vo_direct3dreimar2008-11-261-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28040 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Update Tremor comment regarding fixed-point mode.diego2008-11-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28039 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28038Uoti Urpala2008-11-2520-2654/+2624
|\|
| * Enable compilation with icc 11.0.cehoyos2008-11-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28038 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace pushf/popf by explicit pushfl/popfl (32 bit) or pushfq/popfqcehoyos2008-11-251-3/+12
| | | | | | | | | | | | | | | | (x86_64), to fix generated code on ICC 11.0. Original FFmpeg patch by Reimar. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28037 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, OSD alpha textures were cleared to the wrong value.reimar2008-11-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28036 b3059339-0415-0410-9bf9-f77b7e298cf2
| * typo fix + readability improvementgpoirier2008-11-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28035 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Another part of sync to 27843torinthiel2008-11-241-76/+80
| | | | | | |