1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-16 20:05:07 +00:00
Commit Graph

386 Commits

Author SHA1 Message Date
diego
4dd84909d1 Simplify #include directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23138 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-26 13:26:41 +00:00
compn
8b55dfcf11 make -really-quiet hide the mencoder version tags. patch copied from michael
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23113 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 13:47:06 +00:00
compn
36fcf863ea update year of mencoder version line
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23050 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-21 03:20:13 +00:00
diego
ca3eb46944 Remove unused variable.
patch by Zuxy Meng, zuxy.meng gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22996 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-15 11:35:44 +00:00
uau
e5ab09bb64 Move parsing of the -ss option to the option code.
Also fixes a memory leak of the parameter string.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22330 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-24 07:11:57 +00:00
reimar
4b774aacd1 Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22251 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 21:04:46 +00:00
reimar
0fe4207dfb Move common vo initialization code to video_out.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22250 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 20:58:55 +00:00
ods15
500ca8e218 1000l fix for mencoder -hr-edl-seek with -ovc copy, waiting for keyframe
created infinite loop


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22248 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 16:30:59 +00:00
diego
cae4f4e7b4 DO NOT recommend or even suggest installing codecs.conf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21906 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:57:40 +00:00
nicodvb
cf099b2100 muxers now write to output muxer->stream rather than to muxer->file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 21:03:59 +00:00
nplourde
616383a246 fix mencoder include clash on osx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21428 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 23:48:07 +00:00
reimar
f9b2e78d79 Remove some of the worst "headers include headers which include
completely unrelated headers" mess.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21386 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 14:08:24 +00:00
diego
0810e42750 Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
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
2006-11-28 18:29:24 +00:00
uau
544233bded Make compilation depending on USE_OSD unconditional.
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
2006-11-22 19:21:16 +00:00
kraymer
679d8c41de MSGTRs for mencoder.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21162 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 09:27:45 +00:00
uau
2b50b7ddab Make compilation depending on USE_SUB unconditional.
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
2006-11-21 20:48:17 +00:00
uau
a703241aa9 Update OSD contents only after the correct values for the frame are known.
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
2006-11-14 12:29:20 +00:00
reimar
74a504f25b ARCH_X86 simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20593 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 18:41:25 +00:00
michael
88f9acb2b4 "-o -" -> use stdout
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
2006-10-27 12:25:59 +00:00
ptt
928da7a448 after a long time, finally i could add -endpos option to mplayer executable.
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
2006-09-25 16:47:56 +00:00
diego
636106aee4 Fix MEncoder build when bitmap fonts are disabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19525 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-24 16:25:56 +00:00
ods15
1e7ea68b2e Cosmetics (nothing but spaces, tabs, and a comment changed here..)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19397 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-14 17:27:15 +00:00
reimar
1f258a4a46 re-indent properly after last patch.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19396 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-14 16:17:26 +00:00
reimar
7cf0b7af8f 10l in last commit, move configured-check inside sh_video and sh_video->vfilter check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19395 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-14 16:15:21 +00:00
reimar
822fa55de5 Do not call VFCTRL_FLUSH_FRAMES when the filter chain was never configured,
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
2006-08-14 14:24:17 +00:00
ben
49867bd432 introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-31 17:39:17 +00:00
diego
f89a7da604 Remove support for obsolete and non-free divx4/odivx libraries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19087 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-14 17:14:16 +00:00
reynaldo
4728357b58 Marks several string parameters as const when they are not modified in the function, Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18985 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-09 17:45:36 +00:00
eugeni
e15ae9a600 Initial libass release (without mencoder support).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:26:51 +00:00
reynaldo
a8e3cea4b3 parse_cfgfiles as static in mplayer.c/mencoder.c, patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18893 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-03 23:18:06 +00:00
nicodvb
2831b49bb5 include stream_dvd's interface from libmpdemux/stream_dvd.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18685 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-11 21:29:00 +00:00
rtognimp
7953851892 Temporary workaround for libavcodec issues with B-frames
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
2006-05-09 20:06:34 +00:00
diego
3f62423f42 Rename some misspelled and misnamed messages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18336 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-28 23:06:42 +00:00
uau
8f30963c37 Make EDL compilation unconditional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18313 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 12:40:29 +00:00
corey
eea7b9044c Make mencoder stream size printing use 64 bits.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18301 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-26 20:24:03 +00:00
albeu
ca12039905 No need to include the whole libinput in mencoder
for a single useless function.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18268 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-25 02:01:21 +00:00
reynaldo
3a406e94d7 Get ride of the several if(identify) messy lines and rearangment of some of 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
2006-04-24 07:20:34 +00:00
diego
98aee4cb65 Remove support for default.sub.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18233 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 23:26:12 +00:00
rfelker
f93707e51a arrg more of this stupid cruft
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18003 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-30 23:44:35 +00:00
diego
a33158d60d Convert printfs in aviprint.c to mp_msg and give the information printing
functions in this file a verbosity_level parameter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17978 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 17:25:41 +00:00
diego
eebf08b978 Convert all if(verbose>X) to mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
michael
87323740ed feed something (hopefully correct timestamps) into the video filter chain
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17911 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-21 23:09:52 +00:00
nicodvb
36ac215b45 temporarily disabled the coercion of audio_preload=0 for -of mpeg until I find a proper fix: it horribly distorts filtered sound
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17896 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-19 17:28:13 +00:00
diego
47a665f8c9 The system-wide and the user-specific MEncoder configuration file should both
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
2006-03-14 23:33:37 +00:00
ods15
6133e7cf87 Add uninit for audio before switching to next file and completing encode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17676 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-24 15:43:20 +00:00
corey
960b978a03 Fix video delay when encoding with B-frames.
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
2006-02-21 09:39:22 +00:00
corey
6f446f41b5 New option: -ignore-start
Makes mplayer and mencoder ignore dwStart in AVI files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17655 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-20 09:36:10 +00:00
corey
89d848a8a2 dwStart support for mencoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17649 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-19 09:34:37 +00:00
ods15
0d29a779f8 deobfuscate some a/v sync code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17648 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-19 04:31:14 +00:00
corey
1ab575101a Second-try commit of this patch.
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
2006-02-17 01:57:41 +00:00