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

35 Commits

Author SHA1 Message Date
diego
bcf021b76e Fix printf format string mismatch, eliminates the warning:
ve_vfw.c:252: warning: format '%d' expects type 'int', but argument 2 has type 'long int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26180 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 08:43:20 +00:00
uau
a0a5afc0c5 ve_vfw.c: #include aviheader.h instead of wine avifmt.h
Compilation was broken after libmpdemux/muxer.h started including
libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and
loader/wine/avifmt.h, and the latter has definitions that conflict with
aviheader.h ones. Fix by removing the avifmt.h include.

I did not carefully check that changing the includes doesn't break
any ve_vfw.c code. However it at least fixes compilation, and if the
avifmt.h versions differ in some significant way then the code is
fundamentally broken anyway: ve_vfw cannot use different versions of
the avi struct definitions when it also uses shared muxer.h types
(those must use the standard definitions to keep the type compatible
with what's used in other files).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26178 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 01:57:26 +00:00
diego
fe27bf007b Use correct printf length modifiers, fixes the following warnings:
ve_vfw.c: In function 'vfw_start_encoder':
ve_vfw.c:182: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
ve_vfw.c:183: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
ve_vfw.c:184: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
ve_vfw.c:187: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long int'
ve_vfw.c:188: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
ve_vfw.c:190: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
ve_vfw.c:191: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
ve_vfw.c:192: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
ve_vfw.c:195: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long int'
ve_vfw.c:196: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
ve_vfw.c:216: warning: format '%d' expects type 'int', but argument 4 has type 'long int'
ve_vfw.c:217: warning: format '%d' expects type 'int', but argument 4 has type 'long int'
ve_vfw.c:218: warning: format '%d' expects type 'int', but argument 4 has type 'long int'
ve_vfw.c:221: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'long int'
ve_vfw.c:222: warning: format '%d' expects type 'int', but argument 4 has type 'long int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25290 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-03 23:38:51 +00:00
compn
c040ef5660 Add Coinitialize function to vfw encoder and win32 loader.
Fixes crash when trying to load vp7vfw.dll in vfw2menc.
Patch by Gianluigi Tiesi mplayer___netfarm.it
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2007-September/054136.html



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24798 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-17 05:14:21 +00:00
iive
7bdf397b38 Fix double close() in ve_vfw.c
trivial patch by Gianluigi Tiesi <mplayer netfarm it> 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22817 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-24 22:01:20 +00:00
diego
20d778b3fa Add explicit location for headers from the libmpdemux/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22619 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 17:51:32 +00:00
diego
6b14d50848 Add explicit location for headers from the stream/ directory.
Now for the encoding-related files as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22618 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 17:30:55 +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
alex
857545e725 Controllable quality setting of VFW enconding, through the dumped state of the dialog box. Patch by Gianluigi Tiesi
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22270 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-18 23:24:21 +00:00
nicodvb
cf099b2100 muxers now write to output muxer->stream rather than to muxer->file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 21:03:59 +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
reynaldo
b4c74fb28e Part2 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu with LOTS of modifications by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18005 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-31 00:15:47 +00:00
diego
7416ded30b Change 'if(verbose)' to the more appropriate mp_msg_test.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17970 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 07:22:48 +00:00
michael
02b199e5e9 passing pts through the filter layer (lets see if pts or cola comes out at the end)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-21 21:26:42 +00:00
michael
e6338c5858 change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-26 19:32:07 +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
henry
dbb001bae2 replace VO and VF numeric flags with #defined identifiers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15213 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-18 15:52:38 +00:00
henry
18abbb69a1 fixes for encoding of multiple files
- do not uninitialize video encoder between files
- checks for image size & format change moved from mencoder.c to vfilters

by Oded Shimon <ods15@ods15.dyndns.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14879 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-01 20:21:58 +00:00
reimar
b46fa6a150 Initialized BITMAPINFOHEADER to 0 to avoid problems, esp. windows has problems
when unused parts have bogus values.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14550 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-20 22:53:37 +00:00
ranma
7068c1b886 Use aspect from encoder for AVI vprp header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12062 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-24 15:16:36 +00:00
alex
2283b6305f Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10595 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-13 16:29:32 +00:00
arpi
489b07338c Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
patch by Andriy N. Gritsenko <andrej@lucky.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9015 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-19 01:48:52 +00:00
arpi
bf46a109ed the long-waited MUXER layer, and new MPEG-PS muxer
patch by Andriy N. Gritsenko <andrej@lucky.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8586 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 22:43:20 +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
19bfd0d791 warning fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7558 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-29 19:19:31 +00:00
alex
d066ee0ea8 fixed to comply with new loader
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7391 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-13 21:55:55 +00:00
arpi
c7944423a3 changing return type of put_image void->int
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7369 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-10 22:18:32 +00:00
nexus
bad4039e3c FreeBSD fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7239 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-01 23:06:15 +00:00
alex
b52c558e9a merged with dll_init.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7232 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-01 18:08:44 +00:00
arpi
0f4f7e27cf mostly compiler warning fixes, some small bugfix
patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7128 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 22:45:48 +00:00
alex
5d4502dc66 added support for codec selection
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6084 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-13 21:18:52 +00:00
arpi
2bea9b36a7 mp_image.h and img_format.h moved to libmpcodecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5608 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-13 19:14:34 +00:00
arpi
39e3a780ce capabilities support -> automatic insertion of scale, expand, pp
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5566 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-11 20:56:17 +00:00
arpi
24a5801132 soem fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5552 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-11 02:50:47 +00:00
arpi
4d865e3f47 encoders
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5551 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-10 23:23:36 +00:00