summaryrefslogtreecommitdiffstats
path: root/mencoder.c
Commit message (Collapse)AuthorAgeFilesLines
* strdup subtitle filename at a more appropriate place, fixing memleaks andreimar2005-06-011-2/+11
| | | | | | | double frees. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15604 b3059339-0415-0410-9bf9-f77b7e298cf2
* restored preinit_audio_filters() but set the final sample_rate to the value ↵nicodvb2005-05-241-6/+1
| | | | | | of -srate, if specified: the source sample_rate is sped up or down while the destination can be resampled at will; 1 aboundant liter to me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15566 b3059339-0415-0410-9bf9-f77b7e298cf2
* disable preinit until it's fixed (it breaks -speed...codec is initialized ↵rfelker2005-05-241-0/+5
| | | | | | with wrong samplerate) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15562 b3059339-0415-0410-9bf9-f77b7e298cf2
* patch by oded to fix edl hang when end of audio is reachedrfelker2005-05-241-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15557 b3059339-0415-0410-9bf9-f77b7e298cf2
* preinit audio filters in order to determine the final samplerate and number ↵nicodvb2005-05-221-2/+17
| | | | | | of channels, or audio encoders will be initialized with the wrong parameters git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15547 b3059339-0415-0410-9bf9-f77b7e298cf2
* include get_path.c before avcodec.h, fix error on osx + gcc4 where defined ↵nplourde2005-05-181-2/+2
| | | | | | macro always_inline in libavcodec/common.h already exist in math.h and used for something else. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15508 b3059339-0415-0410-9bf9-f77b7e298cf2
* added twolame mp2 audio encodernicodvb2005-05-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15360 b3059339-0415-0410-9bf9-f77b7e298cf2
* added faac audio encodernicodvb2005-04-251-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15260 b3059339-0415-0410-9bf9-f77b7e298cf2
* audio encoding reworkednicodvb2005-04-221-676/+80
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15235 b3059339-0415-0410-9bf9-f77b7e298cf2
* Errors that cause MEncoder to exit should be MSGL_FATAL, not MSGL_ERR.diego2005-04-061-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15057 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change all MSGT_FIXME, MSGL_FIXME to appropiate values.diego2005-04-061-38/+38
| | | | | | | patch by Oded Shimon < ods15 at ods15 dot dyndns dot org > git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15056 b3059339-0415-0410-9bf9-f77b7e298cf2
* windows priority support patch by Rune Petersen <runner at mail.tele.dk> ↵faust32005-04-021-0/+17
| | | | | | with the freedom to shoot yourself in the foot git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15043 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l to oded.. edl was causing the decoder to get a first broken packetrfelker2005-03-231-4/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14997 b3059339-0415-0410-9bf9-f77b7e298cf2
* EDL for mencoder, patch by Oded (ods15)rfelker2005-03-191-1/+150
| | | | | | | Committed with a few minor fixes. Needs documentation still. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14965 b3059339-0415-0410-9bf9-f77b7e298cf2
* Oded's patch for -speed in mencoder. This can be used for purposesrfelker2005-03-151-19/+39
| | | | | | | | | | like converting back and forth between PAL and FILM (or NTSC-FILM) framerates, or whatever else you like. Doesn't work with -oac copy. Someone give Oded some cola for the error message and fill in a sane one. :)))) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14945 b3059339-0415-0410-9bf9-f77b7e298cf2
* patch by ods15:rfelker2005-03-131-0/+2
| | | | | | | | "10000l to me, I forgot that 'vfilter' could be NULL in case of framecopy, so this code always segfaulted when merging files using -ovc copy..." git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14942 b3059339-0415-0410-9bf9-f77b7e298cf2
* set AvgBytesPerSecond to the correct value if encoding with mp3lame in cbr modenicodvb2005-03-071-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14929 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixes for encoding of multiple fileshenry2005-03-011-23/+23
| | | | | | | | | | - 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
* Multifile 10l bugfix by Oded:rfelker2005-02-271-0/+2
| | | | | | | | | "I never checked merging 2 complete files... at_eof stays non-zero when starting the second file, and doesn't encode a single frame..." git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14846 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanups of the Multiple files patchhenry2005-02-251-8/+4
| | | | | | | by Oded Shimon <ods15@ods15.dyndns.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14828 b3059339-0415-0410-9bf9-f77b7e298cf2
* compile fixhenry2005-02-251-10/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14823 b3059339-0415-0410-9bf9-f77b7e298cf2
* do not hide frame skips/dups! if they happen it's very bad!!rfelker2005-02-251-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14814 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always print dup/skip messages when !quiet.hzoli2005-02-251-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14809 b3059339-0415-0410-9bf9-f77b7e298cf2
* MEncoder multiple files patch by Oded Shimon (ods15)rfelker2005-02-251-19/+188
| | | | | | | | | 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
* fix missing check against lame_init_params that was leading to video only ↵reynaldo2005-02-221-1/+4
| | | | | | files on low (under 32) audio bitrates git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14763 b3059339-0415-0410-9bf9-f77b7e298cf2
* initial, extremely experimental, libavformat muxer; don't expect anything to ↵nicodvb2005-02-211-0/+4
| | | | | | work yet git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14758 b3059339-0415-0410-9bf9-f77b7e298cf2
* small reordering to make future 'multiple files' changes more modular, puts ↵reynaldo2005-02-121-22/+22
| | | | | | single file loading separate from global option loading in the begginning. patch by Oded Shimon git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14686 b3059339-0415-0410-9bf9-f77b7e298cf2
* Print CPUflags and extension support on x86_64, tooreimar2005-01-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14611 b3059339-0415-0410-9bf9-f77b7e298cf2
* happy new yeardiego2005-01-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14297 b3059339-0415-0410-9bf9-f77b7e298cf2
* removing AFMT_ dependancyalex2004-12-271-9/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
* Output more information about vids, aids, sids, alangs and slangs with ↵mosu2004-11-251-0/+1
| | | | | | -identify. Patch by kiriuja <mplayer-patches@en-directo.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reduce excessive verbosity.diego2004-11-151-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13947 b3059339-0415-0410-9bf9-f77b7e298cf2
* add new control message, that is send after end of stream, to flush all ↵iive2004-10-091-0/+8
| | | | | | | | | remaining frames in the video system required by xvid4 encoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13594 b3059339-0415-0410-9bf9-f77b7e298cf2
* printf --> mp_msg conversiondiego2004-10-071-1/+1
| | | | | | | patch by the Wanderer <inverseparadox at comcast dot net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13578 b3059339-0415-0410-9bf9-f77b7e298cf2
* encoding to mp2 with libtoolamenicodvb2004-09-211-0/+94
| | | | 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-1/+3
| | | | | | 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
* printf -> mp_msg conversion, first stepsdiego2004-08-241-160/+58
| | | | | | | patch by The Wanderer <inverseparadox@comcast.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13123 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache min fill adjustment, based on patch by Jeremy Huddlestoniive2004-07-161-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12836 b3059339-0415-0410-9bf9-f77b7e298cf2
* We don't want junk in unused parts of the BITMAPINFOHEADERranma2004-06-081-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12547 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000l....of pepsi :(broke -ovc copy!)rfelker2004-05-191-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12491 b3059339-0415-0410-9bf9-f77b7e298cf2
* more lame optionsrfelker2004-05-191-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12490 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l on cygwin WIN32 gets defined in config.hfaust32004-04-301-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12361 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make it compile on mingw again. Now it is finally possible to include ↵faust32004-04-301-0/+4
| | | | | | windows.h in mplayer.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12359 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l to me!rfelker2004-04-301-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12355 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed loader/ dependancy, imported some files from g2, also used patches ↵alex2004-04-281-1/+1
| | | | | | from Dominik Mierzejewski git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12342 b3059339-0415-0410-9bf9-f77b7e298cf2
* soft skipping for mencoder. rather than skipping decoding/filteringrfelker2004-04-281-2/+4
| | | | | | | | | | | | | | frames that will be skipped, mencoded tells vf_softskip (if present) that it should drop the next frame. this allows filters that need to see every input frame (inverse telecine, denoise3d, ...) to see skipped frames before they get dropped. in principle, a smarter softskip filter could be written that would buffer frames and choose to drop the one with least change, rather than strictly dropping the next one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12338 b3059339-0415-0410-9bf9-f77b7e298cf2
* "hard" frame duplication for mencoder. this finally makes it possiblerfelker2004-04-281-1/+3
| | | | | | | | | to generate valid mpeg output from avi's that have duplicate frames in them, or when using inverse telecine filters. to use it, put the "harddup" filter at the end of your filter chain. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12335 b3059339-0415-0410-9bf9-f77b7e298cf2
* Respect -playlist for asx streamsrtognimp2004-04-171-1/+1
| | | | | | | Patch by adland git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12224 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for abitrary imaadpcm encoding, ported from ffmpegalex2004-04-071-6/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12150 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove spurious +1 to lame_param_quality that contradicts documentation anddiego2004-04-021-1/+1
| | | | | | | | expectations. patch by Charles Wilcox <willo@wpi.edu> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12101 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use aspect from encoder for AVI vprp headerranma2004-03-241-6/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12062 b3059339-0415-0410-9bf9-f77b7e298cf2
* OpenDML read/write supportranma2004-03-171-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12037 b3059339-0415-0410-9bf9-f77b7e298cf2
* rawvideo muxer patch by John Earl <jwe21@cam.ac.uk>ranma2004-03-091-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12017 b3059339-0415-0410-9bf9-f77b7e298cf2
* write out extraheaders from lavcalex2004-02-181-5/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11975 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove raw nonsense and replace it by one ovcattila2004-02-171-6/+3
| | | | | | | patch by John Earl <jwe21@cam.ac.uk> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11967 b3059339-0415-0410-9bf9-f77b7e298cf2
* use libavcodecs float -> fraction conversation if available for -ofps, that ↵michael2004-02-101-0/+8
| | | | | | way exact framerates like 24000/1001 are possible instead of ending up with x/10000 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11947 b3059339-0415-0410-9bf9-f77b7e298cf2
* * changes mencoder's exit code on explicit kill to 2attila2004-01-291-1/+4
| | | | | | | | | | * 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
* add lame filter optionsiive2004-01-231-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11835 b3059339-0415-0410-9bf9-f77b7e298cf2
* Happy new year to all from Argentina :-)diego2004-01-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11779 b3059339-0415-0410-9bf9-f77b7e298cf2
* add -codecs-file for selecting a specific codecs.conf on the comand lineattila2004-01-081-6/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11760 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed the historic libcss supportalex2003-12-081-23/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11593 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100lalex2003-12-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11585 b3059339-0415-0410-9bf9-f77b7e298cf2
* RAWYUV output in MEncoder. Patch by Tuukka Toivonen <tuukkat@ee.oulu.fi>alex2003-12-081-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11582 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, ↵alex2003-12-081-1/+10
| | | | | | but slightly reworked git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11581 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forced subs support for mencoderattila2003-12-081-0/+3
| | | | | | | Patch by Corey Hickey <bugfood-ml@fatooh.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11574 b3059339-0415-0410-9bf9-f77b7e298cf2
* InitTimer has to be called before *Timer-Functions can be used.ranma2003-12-021-0/+2
| | | | | | | | Actually on x86 it works anyway, but for Darwin this is needed. (Patch by Steven M. Schultz) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11551 b3059339-0415-0410-9bf9-f77b7e298cf2
* workaround! exit if there's no video stream (hopefully it's a proper fix)alex2003-11-231-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11514 b3059339-0415-0410-9bf9-f77b7e298cf2
* wrong include on shared lavciive2003-11-071-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11411 b3059339-0415-0410-9bf9-f77b7e298cf2
* mencoder lavc audio encoding supportranma2003-11-031-0/+210
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11376 b3059339-0415-0410-9bf9-f77b7e298cf2
* some updates in muxer apialex2003-10-221-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11223 b3059339-0415-0410-9bf9-f77b7e298cf2
* Removed the historic cfgparser and switched full to the new config parser ↵alex2003-08-131-41/+5
| | | | | | (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
* sync the basic mplayer and mencoder outputsalex2003-07-221-1/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10454 b3059339-0415-0410-9bf9-f77b7e298cf2
* copyright message rework, try 2alex2003-07-131-6/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10418 b3059339-0415-0410-9bf9-f77b7e298cf2
* renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, ↵arpi2003-06-091-2/+2
| | | | | | LIBDIR->MPLAYER_LIBDIR git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10273 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for selecting the audio track in Matroska files via -alang.mosu2003-05-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10168 b3059339-