aboutsummaryrefslogtreecommitdiffhomepage
path: root/mencoder.c
Commit message (Collapse)AuthorAge
* Move duplicated extern declarations of mp_msg_levels and mp_msg_level_allGravatar diego2008-03-04
| | | | | | | to cfg-common.h where they are really needed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26162 b3059339-0415-0410-9bf9-f77b7e298cf2
* #include parser-cfg.h instead of declaring m_config_parse_config_file extern.Gravatar diego2008-03-04
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26160 b3059339-0415-0410-9bf9-f77b7e298cf2
* Select audio stream in mplayer and mencoder, overriding demuxer decision.Gravatar eugeni2008-02-29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26122 b3059339-0415-0410-9bf9-f77b7e298cf2
* Demuxer-independent subtitle track selection.Gravatar eugeni2008-02-29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26119 b3059339-0415-0410-9bf9-f77b7e298cf2
* Attempt to fix -chapter broken for mkv in r25987Gravatar reimar2008-02-28
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26113 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg now uses different (unified) #include paths.Gravatar diego2008-02-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless #ifdefs around extern declarations.Gravatar diego2008-02-20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
* Try to make fps float -> AVRational conversion work better.Gravatar reimar2008-02-14
| | | | | | | | Might make sense to change this once we at least use double for fps everywhere. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25998 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change force_fps and force_ofps to doubleGravatar reimar2008-02-14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializedGravatar diego2008-02-14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* -chapter is now handled uniformly calling demuxer_seek_chapter() insteadGravatar nicodvb2008-02-11
| | | | | | | of letting individual demuxers and stream readers do their nasty job git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25987 b3059339-0415-0410-9bf9-f77b7e298cf2
* It seems that mencoder can not handle correct-pts (lots of "No pts ..." ↵Gravatar reimar2008-02-05
| | | | | | | | | messages), so disable it for now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25954 b3059339-0415-0410-9bf9-f77b7e298cf2
* Extend the precision of rationale conversion soGravatar iive2008-01-19
| | | | | | | | | | it would give proper result for framerate 60000/1001 . Otherwise framerate restrained encoders like lavc mpeg2video would refuse to encode, even if -ofps 60000/1001 is given. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25811 b3059339-0415-0410-9bf9-f77b7e298cf2
* Happy New Year!Gravatar zuxy2008-01-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25583 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix libass to support -nofontconfig.Gravatar ulion2007-12-12
| | | | | | | | For history reason, fontconfig is auto-enabled when ass is enabled, we keep this behavior and document it clearly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25379 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark several uses of vo_functions_t as const to stop some of the currentGravatar reimar2007-12-02
| | | | | | | 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() argumentsGravatar uau2007-11-01
| | | | | | | | | | | | | | | 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() interfaceGravatar uau2007-11-01
| | | | | | | | | | | | 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 structsGravatar uau2007-11-01
| | | | | | | | | | | | | | 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:Gravatar diego2007-09-10
| | | | | | | | 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 linkGravatar diego2007-08-28
| | | | | | | | 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:Gravatar diego2007-08-25
| | | | | | | | 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 inputGravatar uau2007-08-25
| | | | | | | | | | | | | | | | | 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.Gravatar cehoyos2007-08-07
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24025 b3059339-0415-0410-9bf9-f77b7e298cf2
* added support for -alang and -slang with dvdnav:// streamsGravatar nicodvb2007-07-15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23787 b3059339-0415-0410-9bf9-f77b7e298cf2
* Create a new MSGT for just the status line.Gravatar diego2007-06-05
| | | | 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 constantGravatar reimar2007-06-05
| | | | 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 allowGravatar reimar2007-06-05
| | | | | | | 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 ↵Gravatar ben2007-05-20
| | | | | | (controls and menu) and subtitles git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify #include directives.Gravatar diego2007-04-26
| | | | 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 michaelGravatar compn2007-04-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23113 b3059339-0415-0410-9bf9-f77b7e298cf2
* update year of mencoder version lineGravatar compn2007-04-21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23050 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variable.Gravatar diego2007-04-15
| | | | | | | 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.Gravatar uau2007-02-24
| | | | | | | 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 ↵Gravatar reimar2007-02-17
| | | | | | 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.cGravatar reimar2007-02-17
| | | | 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 Gravatar ods152007-02-17
| | | | | | | 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.Gravatar diego2007-01-13
| | | | 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->fileGravatar nicodvb2006-12-18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix mencoder include clash on osxGravatar nplourde2006-12-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21428 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some of the worst "headers include headers which includeGravatar reimar2006-11-29
| | | | | | | 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.Gravatar diego2006-11-28
| | | | | | | 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.Gravatar uau2006-11-22
| | | | | | | | | 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.cGravatar kraymer2006-11-22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21162 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make compilation depending on USE_SUB unconditional.Gravatar uau2006-11-21
| | | | | | | | | | 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.Gravatar uau2006-11-14
| | | | | | | | | | | 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 simplificationsGravatar reimar2006-11-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20593 b3059339-0415-0410-9bf9-f77b7e298cf2
* "-o -" -> use stdoutGravatar michael2006-10-27
| | | | | | | 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.Gravatar ptt2006-09-25
| | | | | | | | 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.Gravatar diego2006-08-24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19525 b3059339-0415-0410-9bf9-f77b7e298cf2