Commit Graph

365 Commits

Author SHA1 Message Date
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
nicodvb f888ebd181 muxer_mpeg MUST be used with audio_preload=0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17591 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-11 21:29:03 +00:00
corey 3f6e7ce5f5 Reverse commit of unfinished patch for passing audio_delay to the demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 19:39:51 +00:00
rathann e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
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
2006-02-09 14:08:03 +00:00
corey 15debd85d2 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.

Other demuxers could be modified similarly in the future.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-07 20:22:44 +00:00
michael e6338c5858 change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-26 19:32:07 +00:00
rathann 2601de4120 massive attack: mp_msg printf format fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-12 20:04:36 +00:00
gpoirier a68b16aec1 Update copyright date to 2006
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17313 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-04 15:28:02 +00:00
nicodvb fc64668e65 disable dvd subtitles by default
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17298 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-03 20:55:27 +00:00
ods15 da8fe66f05 "cfg-mplayer-def.h" is what is written in ~/.mplayer/config when it is not
found, completely unnecessary in mencoder.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17214 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-17 19:55:39 +00:00
wanderer 83e5f5e72a make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17197 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-15 17:57:18 +00:00
ods15 d23cd76afb more warning fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17123 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 10:07:27 +00:00
ods15 aba4eee72d compiler warning fixes, some of these were actual (printing) bugs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17122 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 09:56:44 +00:00
ods15 5cba0a4078 Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
print bogus stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17121 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 05:12:07 +00:00
ods15 5aac28ec24 new -msglevel option, constrols msg level for every msg module
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17107 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 08:42:48 +00:00
rfelker 6a3353a1e9 fatal error when muxer cannot initialize
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17079 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-02 19:41:25 +00:00
reynaldo 2ae5a0788d Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17066 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-29 22:04:57 +00:00
nicodvb 7a8f8317fd buffering in the muxer layer; patch by Corey Hickey (bugfood-ml ad fatooh punctum org) plus small fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17024 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-21 22:53:14 +00:00
gpoirier 618d511e43 print the number of encoded frames per seconds (fps) with a greater precision
(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
2005-11-17 19:17:53 +00:00
reimar 5ecff936b4 Provide percentage even when demuxer->movi_start and movi_end are not available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16876 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-30 09:11:40 +00:00
rfelker db1aa87238 comment on -noskip patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16837 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-23 15:05:11 +00:00
rfelker f14a68b53e honor decoder's/filter's decision to remove frames when using -noskip.
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
2005-10-23 07:37:55 +00:00