1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-26 00:42:57 +00:00
Commit Graph

51 Commits

Author SHA1 Message Date
wm4
24be34f1e9 cleanup: Silence compilation warnings on MinGW-w64
Some of the code, especially the dshow and windows codec loader parts,
are extremely hacky and likely full of bugs. The goal is merely getting
rid of warnings that could obscure more important warnings and actual
bugs, instead of fixing actual problems. This reduces the number of
warnings from over 500 to almost the same as when compiling on Linux.

Note that many problems stem from using the ancient wine-derived
windows headers. There are some differences to the "proper" windows
header. Changing the code to compile with the proper headers would be
too much trouble, and it still has to work on Unix.

Some of the changes might actually break compilation on legacy MinGW,
but we don't support that anymore. Always use MinGW-w64, even when
compiling to 32 bit.

Fixes some warnings in the win32 loader code on Linux too.
2012-03-01 00:22:30 +02:00
reimar
e987cba69d vd_qtvideo: Do not dump image description by default
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32656 b3059339-0415-0410-9bf9-f77b7e298cf2

Reindent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32657 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 04:57:18 +02:00
reimar
b9ab864eec vd_qtvideo: fix crash on OS X with QuickTime
Do not call Setup_FS_Segment if the QuickTime framework is used on OSX
for decoding, even if the loader code is compiled in.
There is no point in it and since Setup_LDT_Keeper is not called before
it will actually crash on OSX due to the auto-alloc functionality not
being initialized and thus it will try to set fs to 0xffffffff.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32486 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
reimar
fe6c4fcae2 cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)
Replace malloc+memset by calloc

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

Replace malloc+memset by calloc.

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

Replace malloc+memset by calloc.

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

Replace some sizeof(type) by sizeof(*pointer)

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

Replace malloc+memset by calloc.

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

Replace malloc+memset by calloc.

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

Replace malloc+memset by calloc

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

Replace sizoef(type) by sizeof(*ptrvar).
Besides being consistent with FFmpeg style,
this reduces the size of a patch to rename these
types to not conflict with the windows.h definitions.

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

Replace malloc+memset by calloc.

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

Replace malloc+memset by calloc.

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

Replace sizeof(type) by sizeof(*ptrvar)

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

Remove a useless cast.

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

Replace sizeof(type)

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

Remove a useless cast.

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

Replace several sizeof(WAVEFORMATEX)

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

Replace one more instance of sizeof(WAVEFORMATEX); fix compilation.
patch by Clément Bœsch, ubitux gmail com

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

Avoid some pointless uses of sizeof() and one related cast.

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

Merge one malloc() + memset() invocation into calloc().

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

Replace malloc+memset by calloc

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

Replace sizeof(WAVEFORMATEX) occurrences.

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

Replace malloc+memset by calloc.

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

Replace sizeof(BITMAPINFOHEADER)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32207 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
reimar
7fe4aa9a3b vd_qtvideo: Some indentation fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31785 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
56599fe4a4 vd_qtvideo: generate a ImageDescription if not given
Generate a ImageDescription if none is passed neither via ImageDesc nor
extradata.
Makes the ProRes decoder work with -demuxer lavf.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31784 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
diego
a7bc7d8e63 cleanup: #include loader/wine/winbase.h instead of local declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31414 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:44 +02:00
diego
e4905ab24f Remove unused variable, fixes the warning:
libmpcodecs/vd_qtvideo.c:242: warning: unused variable 'result'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30912 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 14:35:43 +00:00
sesse
9ffcd31e7d Fix libmpcodecs/vd_qtvideo.c compilation on OS X:
- Declare the "result" variable even for native QuickTime.
 - ExitMovies returns void; don't check its result value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30911 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 14:30:31 +00: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
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
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
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
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
diego
99fd037bd7 Avoid unused variable warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28233 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 12:53:05 +00:00
diego
c6c7538c54 Reorder #includes and #ifdefs to avoid warnings and excessive #ifdeffery.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28231 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 12:28:47 +00:00
diego
3932c5e0b9 Remove unused static declarations, fixes the warnings:
libmpcodecs/vd_qtvideo.c:69: warning: 'ImageCodecDrawBand' defined but not used
libmpcodecs/vd_qtvideo.c:71: warning: 'ImageCodecEndBand' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27464 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 16:04:32 +00: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
diego
c1f5c9bd3f cosmetics: Remove pointless parentheses from return calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 00:23:02 +00: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
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
835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
rtogni
6416245eba Zero codec_inited in the init() function, so that it's cleared everytime
the codec is inites (previously was only cleared once at start time).
Fixes a crash when -loop n (with n >= 2) is used with a qtvideo codec.

Patch by KO Myung-Hun komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25839 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-23 20:48:50 +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
55b5bb3a5e Fix previous broken vd_qtvideo.c commit which failed on MACOSX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21280 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 19:35:56 +00:00
uau
cb2cfdd31c Move #include <QuickTime/ImageCodec.h> before internal headers
to avoid #define of always_inline which would break it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21279 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 19:19:00 +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
7f70c8316b Comment some #endif directives to avoid confusion.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18769 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-21 10:53:20 +00:00
rathann
2601de4120 massive attack: mp_msg printf format fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-12 20:04:36 +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
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
8c8584c8bc printf -> mp_msg, error msg when qtmlClient.dll is missing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12195 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-13 14:48:31 +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
6f7916cae6 handle mencoder's 0-byte 'skipped frames'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8474 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-16 02:38:37 +00:00
arpi
8dc0ce2ade Sorenson 1/3 encoding just for fun :)
ve_qtvideo code by Sascha Sommer
SVQ3 support hack by /me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8472 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-16 01:49:39 +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
e4fc32848b we don't need to pass gworld :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8432 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-11 22:07:03 +00:00
arpi
5be44dbe04 print list of supported output colorspaces
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8431 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-11 21:39:05 +00:00
arpi
ac89694232 moved component lister up, as it messes up 'desc'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8429 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-11 21:26:37 +00:00
arpi
4c286feb2e SVQ1 support (ugly hack... - really we need 'syuv' support in swscaler :))
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8322 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-01 00:09:13 +00:00
arpi
00bd3d6184 - fixed 10l bug (imagedesc handle allocation)
- enabled colorspace selection support, fixed yvu9, added yv12


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8302 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-27 23:47:14 +00:00
alex
b78e41ea8a some fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8283 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-25 18:04:19 +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
283e6c07ed don't print error if no error
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8189 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-14 11:15:17 +00:00
arpi
21092d44f0 no need to EnterMovies(), do minimal InitializeQTML only
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8163 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-12 00:13:31 +00:00