summaryrefslogtreecommitdiffstats
path: root/cfg-mencoder.h
Commit message (Collapse)AuthorAgeFilesLines
* Remove MEncoderUoti Urpala2010-11-021-278/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable MEncoder compilation and remove files used by MEncoder only. There's no attempt to remove all references to MEncoder from the build system, documentation etc at this point. Removed files: (muxers, audio/video encoders, misc) mencoder.c cfg-mencoder.h parser-mecmd.[ch] xvid_vbr.[ch] libmpdemux/muxer* libmpcodecs/ae* libmpcodecs/ve* libmpcodecs/native/rtjpegn.[ch] libmpcodecs/native/mmx.h // was used by rtjpegn only Rationale: MEncoder is still useful for some people, but there's not much potential for further development; in the long run almost all use cases can be handled better by solutions based on something else (for example using FFmpeg or encoding MPlayer output). FFmpeg is already getting video filtering support which should work for some common MEncoder uses. Keeping MEncoder working takes extra work that is away from player development. While that amount of work is not huge (mostly MEncoder can be just ignored), it's not completely insignificant either. MEncoder is still maintained to some degree in the svn tree, so if necessary it's possible to use it from there for now. This tree has never had major improvements for the MEncoder side, so using svn MEncoder instead should be no major loss.
* cfg-common*: Replace common options template by a common options arraydiego2010-11-021-6/+0
| | | | | | | | | This solution works just as well, but avoids a separate template file that needs to be #included from multiple places. The end result is simpler since common options and those of MPlayer and MEncoder are now in only one file each. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31434 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31291Uoti Urpala2010-06-021-0/+1
|\
| * Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it.diego2010-05-301-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31291 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn change r31134Uoti Urpala2010-05-071-136/+136
|\| | | | | | | Fix some search/replace errors introduced in the svn commit.
| * the great MPlayer tab removal: part IIdiego2010-05-031-136/+136
| | | | | | | | | | | | | | some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31004Uoti Urpala2010-04-261-13/+11
|\|
| * Mark encoder-related m_option_t struct arrays as const.diego2010-04-041-10/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30997 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a header for x264enc_set_param() instead of forward declaring it.diego2010-04-031-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30643Uoti Urpala2010-03-101-2/+0
|\|
| * Remove forward declarations for non-existing functions readPPOpt, revertPPOpt.diego2010-02-181-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30634 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30475Uoti Urpala2010-03-091-0/+18
|\|
| * Add license header to all top-level files missing them.diego2010-01-301-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-5/+5
| |
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Restore two mistakenly removed 'extern' keywords.diego2008-12-031-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28087 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of pointless 'extern' keywords.diego2008-12-031-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-24/+24
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Change a bunch of codec-specific preprocessor directives from a HAVE_diego2008-08-021-24/+24
| | | | | | | | | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove checks for HAVE_XVID3, that conditional was removed a long time ago.diego2008-08-021-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27394 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-13/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * Start unifying names of internal preprocessor directives.diego2008-07-301-13/+13
| | | | | | | | | | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Silence "discards qualifiers" warnings when compiling mplayer.cUoti Urpala2008-04-261-4/+4
|/ | | | | | | | | | Add casts to subconfig entries in option lists to avoid the excessive amount of "initialization discards qualifiers from pointer target type" warnings. Also add const to the type of mpctx_get_audio_out to eliminate a warning and make it match the type in the header (svn r25793 had added a const to the header but not mplayer.c). Make libmenu_vfs a table of pointers to const to eliminate another warning plus make the table itself const.
* Split cfg-common.h into two separate header files. It was being included twicediego2008-04-111-3/+1
| | | | | | | | | 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
* Add comments to #endif preprocessor directives.diego2008-03-041-9/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26158 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify preprocessor conditionals: USE_LIBAV* is defined when compilingdiego2008-03-041-3/+3
| | | | | | | against both shared and static libraries. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26157 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-221-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change force_fps and force_ofps to doublereimar2008-02-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add multiple inclusion guards to all header files that lack them.diego2008-01-011-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make the main m_option_t arrays constreimar2007-12-021-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25261 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move fakemono extern to cfg-common.h where it is actually used.reimar2007-12-021-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25259 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless ifdefs around extern declarationsreimar2007-12-021-29/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25258 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make liblzo conditional to the appropriate #defines.diego2007-02-181-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22262 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clarify messages for unavailable options.diego2006-11-141-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20917 b3059339-0415-0410-9bf9-f77b7e298cf2
* make any parse error in -x264encopts fatallorenm2006-10-201-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20323 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix multiple instances of -x264encopts on the commandline (broke in r20060)lorenm2006-10-151-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20258 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove the x264 option parser, and pass the options on to libx264 as a ↵lorenm2006-10-051-2/+2
| | | | | | | | | 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
* after a long time, finally i could add -endpos option to mplayer executable.ptt2006-09-251-2/+0
| | | | | | | | 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
* Remove support for obsolete and non-free divx4/odivx libraries.diego2006-07-141-19/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19087 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix vfw-related things, patches by RC and Compngpoirier2006-05-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18434 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make EDL compilation unconditionaluau2006-04-271-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18313 b3059339-0415-0410-9bf9-f77b7e298cf2
* dwStart support for mencoder.corey2006-02-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17649 b3059339-0415-0410-9bf9-f77b7e298cf2
* added support for external libavformatnicodvb2006-01-091-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove duplicate leftover line.diego2005-11-121-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16982 b3059339-0415-0410-9bf9-f77b7e298cf2
* A long-standing bug... -vfwopts in cfg-mencoder.h is being overriddendiego2005-09-281-1/+1
| | | | | | | | | 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
* Make frameno.avi not turn on by default. this is deprecated and this entireods152005-09-191-0/+2
| | | | | | | 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
* -delay for MEncoder, step 1.ods152005-07-171-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15993 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag ↵ranma2005-07-021-0/+2
| | | | | | with -fafmttag git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15889 b3059339-0415-0410-9bf9-f77b7e298cf2
* rawaudio muxerranma2005-06-191-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15755 b3059339-0415-0410-9bf9-f77b7e298cf2
* Surround lavf in the '-of help' output by #ifdef USE_LIBAVFORMAT.diego2005-05-211-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15542 b3059339-0415-0410-9bf9-f77b7e298cf2
* Document lavf muxers.diego2005-05-201-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15533 b3059339-0415-0410-9bf9-f77b7e298cf2
* added twolame mp2 audio encodernicodvb2005-05-071-1/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15360 b3059339-0415-0410-9bf9-f77b7e298cf2
* added faac audio encodernicodvb2005-04-251-0/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15260 b3059339-0415-0410-9bf9-f77b7e298cf2
* audio encoding reworkednicodvb2005-04-221-27/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15235 b3059339-0415-0410-9bf9-f77b7e298cf2
* EDL for mencoder, patch by Oded (ods15)rfelker2005-03-191-0/+5
| | | | | | | Committed with a few minor fixes. Needs documentation still. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14965 b3059339-0415-0410-9bf9-f77b7e298cf2
* MEncoder multiple files patch by Oded Shimon (ods15)rfelker2005-02-251-28/+28
| | | | | | | | | 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
* The MPEG muxer now supports MPEG-2 as well.diego2005-02-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14772 b3059339-0415-0410-9bf9-f77b7e298cf2
* initial, extremely experimental, libavformat muxer; don't expect anything to ↵nicodvb2005-02-211-0/+9
| | | | | | work yet git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14758 b3059339-0415-0410-9bf9-f77b7e298cf2
* new mpeg muxer compatible with dvd/[s]vcd; small changes in the muxer layer ↵nicodvb2005-02-211-0/+2
| | | | | | (sanity checks in the muxer_init functions) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14754 b3059339-0415-0410-9bf9-f77b7e298cf2
* encoding to mp2 with libtoolamenicodvb2004-09-211-0/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13427 b3059339-0415-0410-9bf9-f77b7e298cf2
* x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at ↵iive2004-08-271-0/+11
| | | | | | 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
* more lame optionsrfelker2004-05-191-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12490 b3059339-0415-0410-9bf9-f77b7e298cf2
* typos, wording and mistakes pointed out by the wandererdiego2004-05-031-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12409 b3059339-0415-0410-9bf9-f77b7e298cf2
* spelling, wording, consistency in comments and printed messagesdiego2004-05-031-26/+27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12408 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow user to disable writing of ODML indexranma2004-04-301-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12364 b3059339-0415-0410-9bf9-f77b7e298cf2
* oops, forgot this with the softskip patchrfelker2004-04-301-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12356 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use aspect from encoder for AVI vprp headerranma2004-03-241-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12062 b3059339-0415-0410-9bf9-f77b7e298cf2
* Better vprp aspect fixranma2004-03-221-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12054 b3059339-0415-0410-9bf9-f77b7e298cf2
* explicit option for AVI PRP headerhenry2004-03-211-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12052 b3059339-0415-0410-9bf9-f77b7e298cf2
*