summaryrefslogtreecommitdiffstats
path: root/mencoder.c
Commit message (Collapse)AuthorAgeFilesLines
* Move some subtitle handling from mplayer.c to mpcommon.c and share it with ↵reimar2007-02-171-26/+6
| | | | | | mencoder.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22251 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move common vo initialization code to video_out.creimar2007-02-171-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22250 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000l fix for mencoder -hr-edl-seek with -ovc copy, waiting for keyframe ods152007-02-171-2/+5
| | | | | | | created infinite loop git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22248 b3059339-0415-0410-9bf9-f77b7e298cf2
* DO NOT recommend or even suggest installing codecs.conf.diego2007-01-131-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21906 b3059339-0415-0410-9bf9-f77b7e298cf2
* muxers now write to output muxer->stream rather than to muxer->filenicodvb2006-12-181-13/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix mencoder include clash on osxnplourde2006-12-011-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21428 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some of the worst "headers include headers which includereimar2006-11-291-1/+1
| | | | | | | completely unrelated headers" mess. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21386 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make MPlayer/MEncoder print the compile-time configuration in verbose mode.diego2006-11-281-0/+2
| | | | | | | based on a patch by Brian Murray, brian game-sat com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21358 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make compilation depending on USE_OSD unconditional.uau2006-11-221-2/+0
| | | | | | | | | USE_OSD was hardcoded to true in configure, manually turning it off would break compilation, and most OSD-related code wasn't affected by it anyway so it did nothing useful. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
* MSGTRs for mencoder.ckraymer2006-11-221-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21162 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make compilation depending on USE_SUB unconditional.uau2006-11-211-6/+0
| | | | | | | | | | USE_SUB was hardcoded to true in configure, manually turning it off would break compilation, and there's no apparent reason why having all subtitle code under #ifdefs (even working ones) would be worth the clutter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21156 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update OSD contents only after the correct values for the frame are known.uau2006-11-141-2/+5
| | | | | | | | | | | The most visible inaccuracy caused by the previous update location was that the OSD always showed position 0 after seeking with demux_mkv. Split frame decoding and filtering because with -correct-pts the pts value that should be displayed for the frame is only known after decoding but is needed before filtering (during which the OSD is drawn). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20918 b3059339-0415-0410-9bf9-f77b7e298cf2
* ARCH_X86 simplificationsreimar2006-11-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20593 b3059339-0415-0410-9bf9-f77b7e298cf2
* "-o -" -> use stdoutmichael2006-10-271-1/+4
| | | | | | | makes users of obscure OSs like window$ happy as they have no /dev/stdout git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20465 b3059339-0415-0410-9bf9-f77b7e298cf2
* after a long time, finally i could add -endpos option to mplayer executable.ptt2006-09-251-56/+6
| | | | | | | | 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
* Fix MEncoder build when bitmap fonts are disabled.diego2006-08-241-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19525 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics (nothing but spaces, tabs, and a comment changed here..)ods152006-08-141-10/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19397 b3059339-0415-0410-9bf9-f77b7e298cf2
* re-indent properly after last patch.reimar2006-08-141-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19396 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l in last commit, move configured-check inside sh_video and ↵reimar2006-08-141-3/+3
| | | | | | sh_video->vfilter check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19395 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not call VFCTRL_FLUSH_FRAMES when the filter chain was never configured,reimar2006-08-141-0/+3
| | | | | | | since that will cause crashes (try with e.g. -ss 99999999999999). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19393 b3059339-0415-0410-9bf9-f77b7e298cf2
* introduce new 'stream' directory for all stream layer related components and ↵ben2006-07-311-2/+2
| | | | | | split them from libmpdemux git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove support for obsolete and non-free divx4/odivx libraries.diego2006-07-141-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19087 b3059339-0415-0410-9bf9-f77b7e298cf2
* Marks several string parameters as const when they are not modified in the ↵reynaldo2006-07-091-1/+1
| | | | | | function, Patch by Stefan Huehner, stefan AT huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18985 b3059339-0415-0410-9bf9-f77b7e298cf2
* Initial libass release (without mencoder support).eugeni2006-07-071-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
* parse_cfgfiles as static in mplayer.c/mencoder.c, patch by Stefan Huehner, ↵reynaldo2006-07-031-1/+1
| | | | | | stefan AT huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18893 b3059339-0415-0410-9bf9-f77b7e298cf2
* include stream_dvd's interface from libmpdemux/stream_dvd.hnicodvb2006-06-111-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18685 b3059339-0415-0410-9bf9-f77b7e298cf2
* Temporary workaround for libavcodec issues with B-framesrtognimp2006-05-091-1/+1
| | | | | | | | | This will be reverted after pre8 release Patch written and approved by Michael Niedermayer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18418 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename some misspelled and misnamed messages.diego2006-04-281-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18336 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make EDL compilation unconditionaluau2006-04-271-12/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18313 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make mencoder stream size printing use 64 bits.corey2006-04-261-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18301 b3059339-0415-0410-9bf9-f77b7e298cf2
* No need to include the whole libinput in mencoderalbeu2006-04-251-1/+5
| | | | | | | for a single useless function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18268 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get ride of the several if(identify) messy lines and rearangment of some of ↵reynaldo2006-04-241-1/+0
| | | | | | the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove support for default.sub.diego2006-04-231-8/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18233 b3059339-0415-0410-9bf9-f77b7e298cf2
* 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