summaryrefslogtreecommitdiffstats
path: root/mencoder.c
Commit message (Collapse)AuthorAgeFilesLines
* arrg more of this stupid cruftrfelker2006-03-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18003 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert printfs in aviprint.c to mp_msg and give the information printingdiego2006-03-271-2/+2
| | | | | | | functions in this file a verbosity_level parameter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17978 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert all if(verbose>X) to mp_msg_test calls.diego2006-03-241-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
* feed something (hopefully correct timestamps) into the video filter chainmichael2006-03-211-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17911 b3059339-0415-0410-9bf9-f77b7e298cf2
* temporarily disabled the coercion of audio_preload=0 for -of mpeg until I ↵nicodvb2006-03-191-0/+3
| | | | | | find a proper fix: it horribly distorts filtered sound git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17896 b3059339-0415-0410-9bf9-f77b7e298cf2
* The system-wide and the user-specific MEncoder configuration file should bothdiego2006-03-141-1/+1
| | | | | | | | be called 'mencoder.conf', not two different names over which code and documentation disagree. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17870 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add uninit for audio before switching to next file and completing encodeods152006-02-241-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17676 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix video delay when encoding with B-frames.corey2006-02-211-0/+3
| | | | | | | | | | Encoding delay is adjusted for on-the-fly during encoding. Decoding delay is compensated for by setting an appropriate dwStart on the audio stream (only in muxer_avi at this point). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17660 b3059339-0415-0410-9bf9-f77b7e298cf2
* New option: -ignore-startcorey2006-02-201-0/+3
| | | | | | | Makes mplayer and mencoder ignore dwStart in AVI files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17655 b3059339-0415-0410-9bf9-f77b7e298cf2
* dwStart support for mencoder.corey2006-02-191-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17649 b3059339-0415-0410-9bf9-f77b7e298cf2
* deobfuscate some a/v sync codeods152006-02-191-14/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17648 b3059339-0415-0410-9bf9-f77b7e298cf2
* Second-try commit of this patch.corey2006-02-171-3/+3
| | | | | | | | | | | | 1. Include audio_delay as an argument to demux_seek. 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. I've quadruple checked this time; hopefully I haven't missed anything. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
* muxer_mpeg MUST be used with audio_preload=0nicodvb2006-02-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17591 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reverse commit of unfinished patch for passing audio_delay to the demuxers.corey2006-02-091-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1. Include audio_delay as an argument to demux_seek.corey2006-02-071-3/+3
| | | | | | | | | | | 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. Other demuxers could be modified similarly in the future. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
* change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to ↵michael2006-01-261-5/+5
| | | | | | muxer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2
* massive attack: mp_msg printf format fixesrathann2006-01-121-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update copyright date to 2006gpoirier2006-01-041-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17313 b3059339-0415-0410-9bf9-f77b7e298cf2
* disable dvd subtitles by defaultnicodvb2006-01-031-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17298 b3059339-0415-0410-9bf9-f77b7e298cf2
* "cfg-mplayer-def.h" is what is written in ~/.mplayer/config when it is notods152005-12-171-1/+0
| | | | | | | found, completely unnecessary in mencoder.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17214 b3059339-0415-0410-9bf9-f77b7e298cf2
* make -o mandatory and add a warning when the extension does not match the ↵wanderer2005-12-151-1/+28
| | | | | | container format, patch by Reynaldo Pinochet git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17197 b3059339-0415-0410-9bf9-f77b7e298cf2
* more warning fixesods152005-12-071-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17123 b3059339-0415-0410-9bf9-f77b7e298cf2
* compiler warning fixes, some of these were actual (printing) bugs.ods152005-12-071-13/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17122 b3059339-0415-0410-9bf9-f77b7e298cf2
* Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'llods152005-12-071-3/+3
| | | | | | | print bogus stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17121 b3059339-0415-0410-9bf9-f77b7e298cf2
* new -msglevel option, constrols msg level for every msg moduleods152005-12-061-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17107 b3059339-0415-0410-9bf9-f77b7e298cf2
* fatal error when muxer cannot initializerfelker2005-12-021-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17079 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT ↵reynaldo2005-11-291-2/+0
| | | | | | -fatooh/org- , small fixes by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17066 b3059339-0415-0410-9bf9-f77b7e298cf2
* buffering in the muxer layer; patch by Corey Hickey (bugfood-ml ad fatooh ↵nicodvb2005-11-211-7/+0
| | | | | | punctum org) plus small fixes by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17024 b3059339-0415-0410-9bf9-f77b7e298cf2
* print the number of encoded frames per seconds (fps) with a greater precisiongpoirier2005-11-171-2/+2
| | | | | | | | | | (float instead of int). Original thread: Date: Nov 17, 2005 3:25 PM Subject: [MPlayer-dev-eng] [PATCH] MEncoder: print more precise FPS git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17006 b3059339-0415-0410-9bf9-f77b7e298cf2
* Provide percentage even when demuxer->movi_start and movi_end are not availablereimar2005-10-301-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16876 b3059339-0415-0410-9bf9-f77b7e298cf2
* comment on -noskip patchrfelker2005-10-231-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16837 b3059339-0415-0410-9bf9-f77b7e298cf2
* honor decoder's/filter's decision to remove frames when using -noskip.rfelker2005-10-231-0/+3
| | | | | | | | | | | | | | | | | | | | this may go against the original intention of the vf layer, but it's how all the filters that drop frames have been written to work, so it's now the de-facto standard. without this patch, -noskip will result in tons of duplicate frames (either soft or hard duplicates) and a/v desync whenever decimation, ivtc, etc. is used. even with this patch -noskip is still a bad idea for most of these purposes, but it will work reliably with filmdint, framestep, and some other filters with fixed in:out ratios as long as the right -ofps value is used. without this patch, there is no hope of -noskip working with frame-dropping filters. (this patch was previously committed erroneously as part of another change, then reversed. it is now being committed again.) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16830 b3059339-0415-0410-9bf9-f77b7e298cf2
* reapply rawaudio muxer fix (don't disable audio without user's permission!) ↵rfelker2005-10-231-4/+0
| | | | | | (previously reversed because of mistake in patch.. 10l to me :) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16829 b3059339-0415-0410-9bf9-f77b7e298cf2
* reverse patch that was mistakenly applied with unwanted unrelated changesrfelker2005-10-231-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16828 b3059339-0415-0410-9bf9-f77b7e298cf2
* document hackods152005-10-201-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16815 b3059339-0415-0410-9bf9-f77b7e298cf2
* processing audio is sometimes essential for a/v sync, so 1000l torfelker2005-10-191-4/+3
| | | | | | | | | | | | | | whoever made rawvideo muxer disable audio!! with this patch, audio is processed but simply thrown away by the muxer. various 'error' conditions in rawvideo muxer are removed to make it work. feel free to re-add them if they can be done without breaking anything, but do not use printf !!!! btw old behavior can be obtained by manually specifying -nosound. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16806 b3059339-0415-0410-9bf9-f77b7e298cf2
* allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at ↵faust32005-10-161-0/+4
| | | | | | gmail.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16782 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics. does not change functionality, but makes code easier to readods152005-10-131-63/+43
| | | | | | | (removes redundant switch-case) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16757 b3059339-0415-0410-9bf9-f77b7e298cf2
* weirdness, flags aren't restored right unless you add this second pushods152005-10-131-0/+1
| | | | | | | | | | | mencoder a.avi b.avi -flag c.avi -flag should've only applied to b, but it applied to both b and c!! No clue why this happens and more so why this solves it. but it does. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16754 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix mencoder multi-file with some files having audio but others dontods152005-10-131-1/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16753 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100000l to meods152005-10-081-3/+6
| | | | | | | | | fixdelay() pre-read a frame to make pts sane, and then called slowseek(), which AGAIN read another frame, and then tries to decode it (which breaks as all frames should be read) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16709 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make frameno.avi not turn on by default. this is deprecated and this entireods152005-09-191-9/+11
| | | | | | | 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
* Demuxer modularizationrtognimp2005-08-051-0/+3
| | | | | | | Demuxer selection by name with -demuxer command (bakward compatible) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support new static libavcodec (depends on libavutil).al2005-08-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16166 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove unused cache-prefill and create cache-seek-min that controls when ↵iive2005-07-311-1/+1
| | | | | | seek_long is prefered over waiting for cache to fill git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16153 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000l to me. Broke compilation when EDL is disabled.ods152005-07-231-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16066 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix invalid pointers passed to init_audio_filtersreimar2005-07-221-3/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16061 b3059339-0415-0410-9bf9-f77b7e298cf2
* define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayerreimar2005-07-221-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16050 b3059339-0415-0410-9bf9-f77b7e298cf2
* catch HUP and PIPE signals aswell. Patch by Sergey Khlutchin (@gmail.com)alex2005-07-181-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16003 b3059339-0415-0410-9bf9-f77b7e298cf2
* -delay for MEncoder, final step 6.ods152005-07-171-1/+38
| | | | | | | | TODO: make it encode silence instead of cutting video as cutting video is unreliable with -ovc copy. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15998 b3059339-0415-0410-9bf9-f77b7e298cf2
* -delay for MEncoder, step 5.ods152005-07-171-22/+32
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15997 b3059339-0415-0410-9bf9-f77b7e298cf2
* -delay for MEncoder, step 4.ods152005-07-171-23/+33
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15996 b3059339-0415-0410-9bf9-f77b7e298cf2
* -delay for MEncoder, step 3.ods152005-07-171-2/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15995 b3059339-0415-0410-9bf9-f77b7e298cf2
* -delay for MEncoder, step 2.ods152005-07-171-28/+31
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15994 b3059339-0415-0410-9bf9-f77b7e298cf2
* -delay for MEncoder, step 1.ods152005-07-171-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15993 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not count skipped/broken frames when using -framesreimar2005-07-031-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15896 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag ↵ranma2005-07-021-0/+14
| | | | | | with -fafmttag git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15889 b3059339-0415-0410-9bf9-f77b7e298cf2
* -don't encode more audio than needed; -edl_skip is int, not short; -don't ↵nicodvb2005-06-271-11/+19
| | | | | | read audio_data to skip in mux_a->buffer; -edl_seek works on input streams, not output; -one-frame accuracy fix ; patch by Oded Shimon git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15832 b3059339-0415-0410-9bf9-f77b7e298cf2
* make -srate work again, unify audio filter init and preinit.reimar2005-06-241-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15812 b3059339-0415-0410-9bf9-f77b7e298cf2
* 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