1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 18:12:22 +00:00
Commit Graph

40 Commits

Author SHA1 Message Date
Uoti Urpala
13221a7165 Merge svn changes up to r30663
Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c
2010-03-10 00:13:11 +02:00
Uoti Urpala
c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
Uoti Urpala
b0986b3760 Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
2010-03-09 18:59:15 +02:00
komh
0599ce10ab Fix the stack crash(SYS3171) on OS/2 when playing qtaudio/qtvideo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30656 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 13:50:16 +00:00
diego
0c3d44619b libmpcodecs: Remove pointless leftover '#if 1' preprocessor instructions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30608 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-17 21:36:00 +00:00
diego
92e3238508 Mark all ad_info_t/vd_info_t structure declarations as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30546 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-12 16:29:34 +00:00
diego
23db422c3d Add missing license headers to all files in the libmpcodecs directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30463 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 16:57:40 +00:00
Uoti Urpala
0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
Uoti Urpala
1db1773ec2 Merge svn changes up to r29277 2009-05-08 23:50:26 +03:00
diego
d9ded9284c Add missing 'void' to parameterless function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 17:35:26 +00:00
Uoti Urpala
9bcd12fdf5 Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
2009-01-15 05:57:31 +02:00
diego
4e13ef3aca Reorder #includes and #ifdefs to avoid excessive #ifdeffery.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28232 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 12:48:11 +00:00
Uoti Urpala
17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03:00
diego
473e2824cb Rename all preprocessor directives related to Apple / Mac OS X.
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-06 07:42:26 +00:00
Uoti Urpala
06a35804f3 Merge svn changes up to r26587
Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c
2008-04-29 05:03:57 +03:00
diego
2f690cb652 Consistently #include mpbswap.h instead of bswap.h everywhere.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26574 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:43:30 +00:00
Uoti Urpala
170d69a71e Make audio decoder description structs const
Make the per-decoder struct ad_functions and its ->info struct
constants. Same for the mpcodecs_ad_drivers[] table of pointers to
those structs.
2008-04-26 16:51:17 +03:00
diego
9e1ccf7447 Introduce HAVE_QUICKTIME definition and use it where appropriate.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26248 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-15 11:31:28 +00:00
diego
6222e5c9de Include loader/ prefix in #include path everywhere.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22595 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 08:29:24 +00:00
uau
3f7645a3b1 Shouldn't move "#ifdef MACOSX" before #include config.h of course...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21276 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:27:42 +00:00
uau
7ecf9d9e29 Move #include <QuickTime/QuickTimeComponents.h> before internal headers.
It was probably broken by #define always_inline in ffmpeg headers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21274 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:06:11 +00:00
diego
60f223f766 Move #ifdefs around complete files into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18774 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-21 14:49:09 +00:00
diego
36e1974be0 Unify include path handling, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-18 14:39:25 +00:00
faust3
97372dab4f preload quicktime.qts, this allows us to ignore the hardcoded path inside the dlls so that quicktime.qts doesn't need to be in the windows system dir, patch by Gianluigi Tiesi <mplayer at netfarm.it>, comments by myself
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14529 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-17 20:57:48 +00:00
faust3
bd20b62b08 fix compilation on macosx with --enable-qtx patch by Zachary Bedell <zaclist@adirondack.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13607 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-10 19:51:18 +00:00
rathann
d9a5e00183 small gcc warning fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13189 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-28 20:59:49 +00:00
faust3
ce0365cb26 do not exit without an error message
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13009 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-12 18:54:22 +00:00
rfelker
92aa4728d6 minimal fix for alex's 1000000000000l compile errors. imo the fix in
aviheader.h is totally correct. defining useless typedefs that can
conflict with other headers is bad practice. i don't like editing
mmreg.h but oh well... if you have a better fix, commit it! finally,
the fix in the ad_ and vd_ files seems totally correct.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12357 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-30 10:26:26 +00:00
faust3
eeefa01d7e printf -> mp_msg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12194 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-13 14:33:18 +00:00
alex
cee9b75818 macosx fix by Dan Christiansen <danchr@daimi.au.dk>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9695 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-26 16:48:17 +00:00
alex
e8f2dabe9b MACOSX support patch, based on Dan Christiansens work
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9503 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-25 15:39:36 +00:00
alex
c254b6c0fb real cygwin support by Sascha Sommer <saschasommer@freenet.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9406 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-12 15:39:59 +00:00
arpi
7dfacf2288 don't abort if setparams failed - fixes some Qclp files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8633 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-29 13:42:58 +00:00
arpi
b987127e0e compiler warning fixes
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8452 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-14 17:56:35 +00:00
arpi
e0143739c3 fixed in/out framesize rounding bug (causing low-rate QCLP hangup/looping)
disabled TerminateQTML(), as it does carshing (due to patched InitializeQTML)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8390 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-07 02:26:45 +00:00
arpi
c3fa2ba9c3 loader support
components.h removed, as it was duplicate of loader/qtx/qtxsdk/*


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8271 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-24 21:49:52 +00:00
arpi
5ccf0da369 fixed output bits per sample
mace support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8160 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-12 00:04:55 +00:00
arpi
f859d013a8 *HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-06 23:54:29 +00:00
arpi
fcb0620032 qtaudio - audio decoder using win32 quicktime 5 dlls
based on code by Sascha Sommer <saschasommer@freenet.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8009 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-31 23:11:34 +00:00