1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-03 21:42:18 +00:00
Commit Graph

60 Commits

Author SHA1 Message Date
diego
29bdac6cd6 loader/qtx: cleanup
Remove unused function ComponentDummy().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31406 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unnecessary get_path() declaration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31408 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unnecessary get_path() declaration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31409 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace forward declarations by loader/wine/winbase.h #include.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31410 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unnecessary and unused #defines.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31411 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:42 +02:00
Uoti Urpala
ff559b8e90 Merge svn changes up to r30907 2010-04-26 16:57:25 +03:00
sesse
45fd2e0457 Use the high-level QuickTime decoding APIs (DecompressSequenceFrameS and
friends) instead of the unsupported, internal ones (ImageCodecBeginBand
etc.). This is a prerequisite for, among others, Apple ProRes 4:2:2 support,
and simplifies the file by quite a bit.

Tested on Linux with all existing QuickTime codecs I could get to work in the
first place; qt261, qtavui, qtsvq3 have no change. qtcvid appears to not give
bit-exact the same output as before, but it looks just the same in playback
to me. qt3ivx stops crashing on exit (so works better than before). With some
extra patches and a codecs.conf entry, ProRes 4:2:2 also works, including on
Linux.

Since codec initialization is now actually done on decoder init instead of on
first frame, fallback should also work a bit better (although usually, qtvideo
is last in the chain). Also made the decoder complain explicitly if the
demuxer data is not there (ie., the user tried to run without -demuxer mov).

This patch is a cleaned up version of what Andrew Wason (rectalogic A
rectalogic D com) posted to mplayer-dev-eng in June.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30899 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 12:05:56 +00:00
Uoti Urpala
0269d22d32 Merge svn changes up to r30876 2010-03-10 03:18:42 +02:00
Uoti Urpala
5c6795a687 Merge svn changes up to r30494
Conflicts:
	libvo/vo_gl.c
	libvo/x11_common.c
2010-03-09 19:34:30 +02:00
sesse
9b67104eb7 Correct QuickTime dpi output.
The dpi value for QuickTime codecs is stored as Fixed16 (16.16 fixed-point),
not int. Correct the output value accordingly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30865 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-08 19:54:07 +00:00
sesse
a8804d4d71 Fix QuickTime emulated OSErr type.
The OSErr type on Mac OS X is int16_t, not int32_t (see
http://developer.apple.com/mac/library/documentation/QuickTime/Reference/QTRef_DataTypes/Reference/reference.html).
The upper 16 bits will typically be something random (they're entirely
undefined). Change the type so it's right; a few places tried to compensate
for this by masking out the upper bits, but a few places also missed them,
which made for unpredictable behavior.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30854 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-06 11:12:32 +00:00
diego
d7a1d12f61 Add missing license headers to test programs for external libraries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30494 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-03 08:32:35 +00:00
Uoti Urpala
852570d342 Merge svn changes up to r30216 2010-01-08 02:39:39 +02:00
diego
a4ce4a23b7 Drop -Iloader from CPPFLAGS for the loader subdirectory.
Instead use full relative paths in #includes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30212 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 20:32:23 +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
186e5a998c Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
2009-02-18 01:45:36 +02:00
diego
ec3cc468ca cosmetics: Replace unused 'argc/argv' in main declarations by 'void'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28634 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 12:00:43 +00:00
Uoti Urpala
0301309425 Merge svn changes up to 27824
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
2008-10-25 05:12:34 +03:00
diego
33c347f66e Translate a Hungarian comment, thanks to Denes Balatoni.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27806 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-19 20:02:21 +00:00
diego
26b29f4f2d Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.
We were using an inconsistent mix of the three variants and 'volatile' should
be the most correct and portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27791 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 20:17:56 +00:00
Uoti Urpala
d5c868325c Merge svn changes up to r26979
Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c
2008-06-04 08:10:48 +03:00
diego
bc0058c63e cosmetics: Remove pointless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26789 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:31:55 +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
9a885b71aa Remove calls to Restore_LDT_Keeper, exit() is called immediately afterwards
anyway. The calls were missing parameters and caused compilation failures.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26570 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:07:01 +00:00
diego
09e2855266 Add missing ldt_keeper.h #include; this fixes a bunch of implicit declaration
of function warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26569 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:05:25 +00:00
diego
35649cad4a Add missing #include, fixes the warning:
qtx/qtxload.c:50: warning: implicit declaration of function 'mp_msg_init'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26562 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:03:52 +00:00
diego
7f6d9b2b91 Adjust printf length modifier, fixes the warning:
qtx/list.c:54: warning: format '%d' expects type 'int', but argument 2 has type 'long int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26561 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:01:13 +00:00
diego
f2d8773fca Comment out variables only used in commented-out code, fixes the warnings:
qtx/qtxload.c:46: warning: unused variable 'i'
qtx/qtxload.c:45: warning: unused variable 'esp'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26560 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:57:38 +00:00
Uoti Urpala
634af01685 loader/qtx/qtxsdk/components.h: Disable large unused inline functions
Put various dump_* functions under #if 0. They aren't used by any
current code but trigger compiler warnings.
2008-04-28 12:16:13 +03:00
diego
bb7b132e08 Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26077 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-23 14:50:55 +00:00
diego
3bbe897e24 Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a
capital letter are reserved for the system, those starting with _ are
reserved at the file level.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25822 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-20 17:16:39 +00:00
diego
7372e69048 /usr/lib/win32 --> /usr/local/lib/codecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25621 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 12:22:56 +00:00
diego
92a4156d2b Remove compilation command comments.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25620 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 12:20:41 +00:00
diego
5bde13b86b Comment out non-existing mp_msg_set_level function to fix linking.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25618 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 11:56:03 +00:00
diego
e69da423b6 Fix compilation by replacing a broken macro with in-place code.
qtx/qtxload.c:16:1: error: pasting "*" and "ComponentDispatch" does not give a valid preprocessing token


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25617 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 11:53:51 +00:00
diego
91f3b6460e Fix compilation due to conflicting type declaration:
qtx/list.c:22: error: conflicting types for 'OSErr'
qtx/qtxsdk/components.h:15: error: previous declaration of 'OSErr' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25616 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 11:45:47 +00:00
diego
7229f29d19 Add missing #include so that the header works standalone.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25615 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 11:43:14 +00:00
diego
444ec084df Add proper compilation rules for qtx/list and qtx/qtxload and remove silly
compilation shell script.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25614 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 11:40:49 +00:00
diego
2b6af2000b Add multiple inclusion guards to all header files that lack them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 21:35:58 +00:00
reynaldo
132173bbf0 get_path as const, patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18894 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-03 23:27:37 +00:00
ivo
452c2ba5da Remove stray MSDOS linebreaks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16195 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-10 22:48:32 +00:00
faust3
4f9ec2c516 AMD64 fixes based on patch by Timo Teräs <timo.teras@iki.fi>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13810 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-30 12:17:16 +00:00
rathann
e1dc488097 Warning fixes (approved by A'rpi).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11413 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-08 00:26:51 +00:00
arpi
6b9defb1fb CRLF->LF
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8471 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-16 01:47:42 +00:00
arpi
34504396cd dump more!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8324 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-01 00:28:04 +00:00
arpi
dc18e7dcbe some new experiments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8269 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-24 21:43:17 +00:00
arpi
00637e4597 fixes, updates
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8267 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-24 21:25:00 +00:00
arpi
cc54e54ca0 dump stuff
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5335 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-25 13:35:23 +00:00
arpi
d41172cdcd some more...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5254 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-21 21:00:21 +00:00
arpi
2fbdb9bdda InitializeQTML(0) added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5212 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-20 03:03:29 +00:00
arpi
15948a320d comments on compiling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5211 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-20 01:39:09 +00:00
arpi
7824552bad simple sample proggy, using qtmlClient.dll to access QT components
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5210 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-20 01:36:41 +00:00
arpi
7691e1a8b4 more mess
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3936 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-01 23:18:17 +00:00