summaryrefslogtreecommitdiffstats
path: root/mencoder.c
Commit message (Collapse)AuthorAgeFilesLines
* Mark several uses of vo_functions_t as const to stop some of the currentreimar2007-12-021-1/+1
| | | | | | | hacks e.g. in vidix code from spreading. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25247 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify init_audio_filters() argumentsuau2007-11-011-10/+6
| | | | | | | | | | | | | | | Remove the following arguments as redundant: in_channels, in_format, out_minsize, out_maxsize. The first two always equal fields of the sh_audio_t struct given as the first argument to the function. The last two are unused after the allocation of sh_audio->a_out_buffer was changed to be done on demand. After the out_minsize and out_maxsize arguments are removed the function preinit_audio_filters() is identical to init_audio_filters(), so remove it and use the latter instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24922 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change decode_audio() interfaceuau2007-11-011-8/+1
| | | | | | | | | | | | Rewrite decode_audio to better deal with filters that handle input in large blocks. It now always places output in sh_audio->a_out_buffer (which was always given as a parameter before) and reallocates the buffer if needed. After the changes filters can return arbitrarily large blocks of data without some of it being lost. The new version also allows simplifying some code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24920 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up some fields in stheader.h structsuau2007-11-011-1/+0
| | | | | | | | | | | | | | sh_video_t: void *video_out: only assigned to, never read. Remove. sh_video_t: void *vfilter: change type to struct vf_instance_s * sh_audio_t: void *afilter: change type to struct af_stream_s * The latter two never hold different types so there's no reason to use void *. Maybe they were originally defined that way because the option of using pointers to incomplete struct types was missed (the typedefs vf_instance_t and af_stream_t would require extra headers)? git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24919 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fix:diego2007-09-101-0/+1
| | | | | | | | cfg-common.h:347: warning: redundant redeclaration of 'vd_use_slices' libmpcodecs/vd.h:19: warning: previous declaration of 'vd_use_slices' was here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24397 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up the way get_path is handled: Compile get_path.c to an object to linkdiego2007-08-281-1/+1
| | | | | | | | against instead of directly #including the C file and replace the many extern declarations by a proper header file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix warning:diego2007-08-251-1/+0
| | | | | | | | mencoder.c:137: warning: redundant redeclaration of 'verbose' mp_msg.h:6: warning: previous declaration of 'verbose' was here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24181 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make terminal input work more like VO key inputuau2007-08-251-0/+4
| | | | | | | | | | | | | | | | | The Unix version of getch2() could either return an internally buffered key or do a second-level select() in addition to the input.c one and then read more data. Change getch2() to always add all read keys with mplayer_put_key() (like video output window keyboard input does) and remove the internal select() from the Unix version. Make input.c call mplayer_get_key() directly. The primary motivation for this change is to make combining multiple event sources under one select() easier. Now getch2() only needs to be called when the corresponding fd is readable, and it will be possible to handle events from X-based VOs with the same code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24149 b3059339-0415-0410-9bf9-f77b7e298cf2
* Kill two warnings.cehoyos2007-08-071-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24025 b3059339-0415-0410-9bf9-f77b7e298cf2
* added support for -alang and -slang with dvdnav:// streamsnicodvb2007-07-151-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23787 b3059339-0415-0410-9bf9-f77b7e298cf2
* Create a new MSGT for just the status line.diego2007-06-051-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23478 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use fast_memcpy for small size copy, esp. when the size is constantreimar2007-06-051-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23476 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace implicit use of fast_memcpy via macro by explicit use to allowreimar2007-06-051-8/+8
| | | | | | | for future optimization. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
* add new -subfont option, that allows having a different font for OSD ↵ben2007-05-201-0/+1
| | | | | | (controls and menu) and subtitles git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify #include directives.diego2007-04-261-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23138 b3059339-0415-0410-9bf9-f77b7e298cf2
* make -really-quiet hide the mencoder version tags. patch copied from michaelcompn2007-04-251-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23113 b3059339-0415-0410-9bf9-f77b7e298cf2
* update year of mencoder version linecompn2007-04-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23050 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variable.diego2007-04-151-1/+0
| | | | | | | patch by Zuxy Meng, zuxy.meng gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22996 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move parsing of the -ss option to the option code.uau2007-02-241-11/+2
| | | | | | | Also fixes a memory leak of the parameter string. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22330 b3059339-0415-0410-9bf9-f77b7e298cf2
* 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