Commit Graph

125 Commits

Author SHA1 Message Date
diego 4bec934234 Split cfg-common.h into two separate header files. It was being included twice
with different definitions set that activated either the lower or the upper
half of the header. The effectively simulated using two different header files.
It is more straightforward to split the header instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26392 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 09:48:36 +00:00
diego 3cd1f73f70 Add comments to #endif preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26158 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 19:34:56 +00:00
diego 64ab68dc1d Simplify preprocessor conditionals: USE_LIBAV* is defined when compiling
against both shared and static libraries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26157 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 19:30:35 +00:00
diego 8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
reimar c1a683ad8c Change force_fps and force_ofps to double
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:50:34 +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
reimar 37235a01d9 Make the main m_option_t arrays const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25261 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 16:45:34 +00:00
reimar 1bf629e38e Move fakemono extern to cfg-common.h where it is actually used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25259 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 16:10:56 +00:00
reimar 54016c6776 Remove pointless ifdefs around extern declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25258 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 16:08:07 +00:00
diego c9232c4a62 Make liblzo conditional to the appropriate #defines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22262 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-18 19:28:47 +00:00
diego 2d8010498d Clarify messages for unavailable options.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20917 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 11:14:03 +00:00
lorenm 11a8049263 make any parse error in -x264encopts fatal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20323 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-20 19:19:29 +00:00
lorenm 34a5cd1be8 fix multiple instances of -x264encopts on the commandline (broke in r20060)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20258 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 23:11:36 +00:00
lorenm 0594cd07a0 Remove the x264 option parser, and pass the options on to libx264 as a string instead. This provides automatic support for all current and future x264 options.
A few options had to be reorganized: partitions, deblockalpha/beta, me, direct_pred.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20060 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-05 02:03:10 +00:00
ptt 928da7a448 after a long time, finally i could add -endpos option to mplayer executable.
as oded told me on 1006 02 24, i applied it, blame me if some problem occurs,
i hope not, since i tried it for a while....


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19979 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-25 16:47:56 +00:00
diego f89a7da604 Remove support for obsolete and non-free divx4/odivx libraries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19087 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-14 17:14:16 +00:00
gpoirier 19fd398418 fix vfw-related things, patches by RC and Compn
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18434 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-11 05:51:26 +00:00
uau 8f30963c37 Make EDL compilation unconditional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18313 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 12:40:29 +00:00
corey 89d848a8a2 dwStart support for mencoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17649 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-19 09:34:37 +00:00
nicodvb ad978de549 added support for external libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-09 19:35:44 +00:00
diego 64f4a3f32f Remove duplicate leftover line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16982 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-12 22:02:17 +00:00
diego f802240b8f A long-standing bug... -vfwopts in cfg-mencoder.h is being overridden
by -vf* in cfg-common.h.  The easiest fix of all, add an 'x' to the
name:  -xvfwopts
patch by RC <rcooley -- at -- spamcop -- dot -- net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16618 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-28 21:49:40 +00:00
ods15 591fadadfd Make frameno.avi not turn on by default. this is deprecated and this entire
feature should be removed anyway. manpage update in a bit...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16529 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-19 19:23:38 +00:00
ods15 0383e89616 -delay for MEncoder, step 1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15993 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 19:25:33 +00:00
ranma a123c6be4c Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15889 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-02 19:00:13 +00:00
ranma 6ca9795767 rawaudio muxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15755 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-19 09:12:44 +00:00
diego ab9eeeed25 Surround lavf in the '-of help' output by #ifdef USE_LIBAVFORMAT.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15542 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-21 18:19:13 +00:00
diego f6c5a0788c Document lavf muxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15533 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-20 23:22:54 +00:00
nicodvb 5bb432dbbe added twolame mp2 audio encoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15360 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-07 14:50:14 +00:00
nicodvb 4ba9687064 added faac audio encoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15260 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-25 07:07:57 +00:00
nicodvb 3faa5ea6fd audio encoding reworked
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15235 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-22 06:59:59 +00:00
rfelker 7d547bfd7e EDL for mencoder, patch by Oded (ods15)
Committed with a few minor fixes. Needs documentation still.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14965 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-19 20:55:51 +00:00
rfelker 72b583051d MEncoder multiple files patch by Oded Shimon (ods15)
Seems to work, or at least not to cause problems with existing
functionality (encoding single files).
Please test and report bugs, if there are any!


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14803 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-25 02:32:29 +00:00
diego 0b151b7ea9 The MPEG muxer now supports MPEG-2 as well.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14772 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-22 21:27:58 +00:00
nicodvb aa566ac6de initial, extremely experimental, libavformat muxer; don't expect anything to work yet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14758 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-21 23:18:31 +00:00
nicodvb 10069de306 new mpeg muxer compatible with dvd/[s]vcd; small changes in the muxer layer (sanity checks in the muxer_init functions)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14754 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-21 21:45:49 +00:00
nicodvb db4e77d0a5 encoding to mp2 with libtoolame
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13427 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-21 19:50:54 +00:00
iive 6379fb900a x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13167 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-27 20:43:05 +00:00
rfelker 0e5425c2b9 more lame options
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12490 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-19 04:33:00 +00:00
diego 3ef2f6a8e8 typos, wording and mistakes pointed out by the wanderer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12409 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-03 13:19:04 +00:00
diego 069e8ca739 spelling, wording, consistency in comments and printed messages
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12408 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-03 10:09:18 +00:00
ranma feaead4393 Allow user to disable writing of ODML index
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12364 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-30 21:33:53 +00:00
rfelker e2cb513292 oops, forgot this with the softskip patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12356 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-30 10:07:52 +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
ranma 10c153004d Better vprp aspect fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12054 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-22 01:42:43 +00:00
henry 4d82f24e5b explicit option for AVI PRP header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12052 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-21 21:32:54 +00:00
ranma 5865c8ccde rawvideo muxer patch by John Earl <jwe21@cam.ac.uk>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12017 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-09 14:46:34 +00:00
attila 268daef9cd remove raw nonsense and replace it by one ovc
patch by John Earl <jwe21@cam.ac.uk>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11967 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-17 12:43:07 +00:00
diego e4b10f79fd Duplicate -include option moved to cfg-common.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11923 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-05 17:08:55 +00:00
attila 333832e130 * changes mencoder's exit code on explicit kill to 2
* add quiet/noquiet to mencoder
* dont depend targets on themselfs
patch by Oswald Buddenhagen <ossi@kde.org>
additionaly moved quiet/noquiet and v/verbose to cfg-common.h


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11876 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-29 12:01:26 +00:00