Commit Graph

387 Commits

Author SHA1 Message Date
nicodvb 22a08bc346 restored preinit_audio_filters() but set the final sample_rate to the value of -srate, if specified: the source sample_rate is sped up or down while the destination can be resampled at will; 1 aboundant liter to me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15566 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-24 19:46:44 +00:00
rfelker ec7e1a378c disable preinit until it's fixed (it breaks -speed...codec is initialized with wrong samplerate)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15562 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-24 08:29:45 +00:00
rfelker 1c92db1cd3 patch by oded to fix edl hang when end of audio is reached
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15557 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-24 02:41:48 +00:00
nicodvb d1c33346ad preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15547 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-22 15:34:23 +00:00
nplourde 5b963b3ce0 include get_path.c before avcodec.h, fix error on osx + gcc4 where defined macro always_inline in libavcodec/common.h already exist in math.h and used for something else.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15508 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-18 12:24:20 +00:00
nicodvb 5bb432dbbe added twolame mp2 audio encoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15360 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-07 14:50:14 +00:00
nicodvb 4ba9687064 added faac audio encoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15260 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-25 07:07:57 +00:00
nicodvb 3faa5ea6fd audio encoding reworked
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15235 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-22 06:59:59 +00:00
diego f2312ef605 Errors that cause MEncoder to exit should be MSGL_FATAL, not MSGL_ERR.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15057 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-06 07:58:30 +00:00
diego 77d02c3ec1 Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
patch by Oded Shimon < ods15 at ods15 dot dyndns dot org >


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15056 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-06 07:53:42 +00:00
faust3 14ecebe920 windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15043 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-02 18:29:16 +00:00
rfelker c277e01799 100l to oded.. edl was causing the decoder to get a first broken packet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14997 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-23 23:29:54 +00:00
rfelker 7d547bfd7e EDL for mencoder, patch by Oded (ods15)
Committed with a few minor fixes. Needs documentation still.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14965 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-19 20:55:51 +00:00
rfelker 099b134f67 Oded's patch for -speed in mencoder. This can be used for purposes
like converting back and forth between PAL and FILM (or NTSC-FILM)
framerates, or whatever else you like. Doesn't work with -oac copy.
Someone give Oded some cola for the error message and fill in a sane
one. :))))


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14945 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-15 04:10:57 +00:00
rfelker d9db1b3b5e patch by ods15:
"10000l to me, I forgot that 'vfilter' could be NULL in case of framecopy, so
this code always segfaulted when merging files using -ovc copy..."


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14942 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-13 21:38:20 +00:00
nicodvb 883b0fad3e set AvgBytesPerSecond to the correct value if encoding with mp3lame in cbr mode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14929 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-07 22:00:29 +00:00
henry 18abbb69a1 fixes for encoding of multiple files
- do not uninitialize video encoder between files
- checks for image size & format change moved from mencoder.c to vfilters

by Oded Shimon <ods15@ods15.dyndns.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14879 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-01 20:21:58 +00:00
rfelker 7f9401e34a Multifile 10l bugfix by Oded:
"I never checked merging 2 complete files...
at_eof stays non-zero when starting the second file, and doesn't encode a
single frame..."


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14846 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-27 18:22:23 +00:00
henry 9699d2dcec cleanups of the Multiple files patch
by Oded Shimon <ods15@ods15.dyndns.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14828 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-25 22:49:36 +00:00
henry a888a60fdc compile fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14823 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-25 12:59:59 +00:00
rfelker 8173fd8929 do not hide frame skips/dups! if they happen it's very bad!!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14814 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-25 10:17:32 +00:00
hzoli ea6a892456 Always print dup/skip messages when !quiet.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14809 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-25 07:43:40 +00:00
rfelker 72b583051d MEncoder multiple files patch by Oded Shimon (ods15)
Seems to work, or at least not to cause problems with existing
functionality (encoding single files).
Please test and report bugs, if there are any!


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14803 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-25 02:32:29 +00:00
reynaldo 451ec22f8f fix missing check against lame_init_params that was leading to video only files on low (under 32) audio bitrates
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14763 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-22 15:13:28 +00:00
nicodvb aa566ac6de initial, extremely experimental, libavformat muxer; don't expect anything to work yet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14758 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-21 23:18:31 +00:00
reynaldo 9a2b32ca82 small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14686 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-12 15:11:02 +00:00
reimar 23bf3efd41 Print CPUflags and extension support on x86_64, too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14611 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-29 21:26:20 +00:00
diego e9a2cd5738 happy new year
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14297 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-02 14:10:13 +00:00
alex 507121f7fe removing AFMT_ dependancy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-27 17:30:15 +00:00
mosu 50a86fcc34 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-25 22:24:00 +00:00
diego 3ebf6f0135 Reduce excessive verbosity.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13947 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-15 09:09:29 +00:00
iive e5b4b495c3 add new control message, that is send after end of stream, to flush all remaining frames in the video system
required by xvid4 encoder.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13594 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-09 13:07:18 +00:00
diego 2ae4fd50f0 printf --> mp_msg conversion
patch by the Wanderer <inverseparadox at comcast dot net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13578 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-07 00:14:23 +00:00
nicodvb db4e77d0a5 encoding to mp2 with libtoolame
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13427 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-21 19:50:54 +00:00
iive 6379fb900a x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13167 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-27 20:43:05 +00:00
diego ba0fc01e35 printf -> mp_msg conversion, first steps
patch by The Wanderer <inverseparadox@comcast.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13123 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-24 19:36:17 +00:00
iive 9b0d8c680f cache min fill adjustment, based on patch by Jeremy Huddleston
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12836 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-16 20:31:17 +00:00
ranma 004f28c039 We don't want junk in unused parts of the BITMAPINFOHEADER
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12547 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-08 16:43:24 +00:00
rfelker 0a8e949872 1000l....of pepsi :(broke -ovc copy!)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12491 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-19 04:38:05 +00:00
rfelker 0e5425c2b9 more lame options
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12490 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-19 04:33:00 +00:00
faust3 4926bfdabb 10l on cygwin WIN32 gets defined in config.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12361 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-30 20:05:54 +00:00
faust3 0af4151b05 Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12359 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-30 16:56:00 +00:00
rfelker 4f3491bbdf 100l to me!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12355 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-30 09:46:54 +00:00
alex d8c3060141 removed loader/ dependancy, imported some files from g2, also used patches from Dominik Mierzejewski
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12342 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-28 10:18:33 +00:00
rfelker 46ca153401 soft skipping for mencoder. rather than skipping decoding/filtering
frames that will be skipped, mencoded tells vf_softskip (if present)
that it should drop the next frame. this allows filters that need to
see every input frame (inverse telecine, denoise3d, ...) to see
skipped frames before they get dropped.

in principle, a smarter softskip filter could be written that would
buffer frames and choose to drop the one with least change, rather
than strictly dropping the next one.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12338 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-28 04:29:17 +00:00
rfelker 1b253f931b "hard" frame duplication for mencoder. this finally makes it possible
to generate valid mpeg output from avi's that have duplicate frames in
them, or when using inverse telecine filters. to use it, put the
"harddup" filter at the end of your filter chain.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12335 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-28 04:02:46 +00:00
rtognimp e3daf3ca75 Respect -playlist for asx streams
Patch by adland


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12224 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-17 16:46:41 +00:00
alex 11c255bf20 support for abitrary imaadpcm encoding, ported from ffmpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12150 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-07 12:46:14 +00:00
diego 931e26df8f Remove spurious +1 to lame_param_quality that contradicts documentation and
expectations.
patch by Charles Wilcox <willo@wpi.edu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12101 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-02 03:44:30 +00:00
ranma 7068c1b886 Use aspect from encoder for AVI vprp header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12062 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-24 15:16:36 +00:00
ranma 873b579c1a OpenDML read/write support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12037 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-17 14:50:37 +00:00
ranma 5865c8ccde rawvideo muxer patch by John Earl <jwe21@cam.ac.uk>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12017 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-09 14:46:34 +00:00
alex 7c231eee58 write out extraheaders from lavc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11975 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-18 13:33:16 +00:00
attila 268daef9cd remove raw nonsense and replace it by one ovc
patch by John Earl <jwe21@cam.ac.uk>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11967 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-17 12:43:07 +00:00
michael fccc9cf57d use libavcodecs float -> fraction conversation if available for -ofps, that way exact framerates like 24000/1001 are possible instead of ending up with x/10000
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11947 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-10 14:12:26 +00:00
attila 333832e130 * changes mencoder's exit code on explicit kill to 2
* add quiet/noquiet to mencoder
* dont depend targets on themselfs
patch by Oswald Buddenhagen <ossi@kde.org>
additionaly moved quiet/noquiet and v/verbose to cfg-common.h


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11876 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-29 12:01:26 +00:00
iive 35ef696600 add lame filter options
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11835 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-23 01:13:00 +00:00
diego f603b6dc93 Happy new year to all from Argentina :-)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11779 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-12 03:47:49 +00:00
attila fab8cc090f add -codecs-file for selecting a specific codecs.conf on the comand line
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11760 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-08 18:02:31 +00:00
alex 922162fb5d removed the historic libcss support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11593 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 21:34:05 +00:00
alex 85f98092f5 100l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11585 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 13:30:30 +00:00
alex 27c454b139 RAWYUV output in MEncoder. Patch by Tuukka Toivonen <tuukkat@ee.oulu.fi>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11582 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 12:44:11 +00:00
alex e7d9078afc Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11581 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 12:14:32 +00:00
attila 22c88e74e3 Forced subs support for mencoder
Patch by Corey Hickey <bugfood-ml@fatooh.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11574 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 09:32:40 +00:00
ranma fb3628e2ce InitTimer has to be called before *Timer-Functions can be used.
Actually on x86 it works anyway, but for Darwin this is needed.
(Patch by Steven M. Schultz)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11551 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-02 23:40:05 +00:00
alex 2ee913d372 workaround! exit if there's no video stream (hopefully it's a proper fix)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11514 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-23 19:30:05 +00:00
iive 258a4950a4 wrong include on shared lavc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11411 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-07 23:32:38 +00:00
ranma 834c6ad746 mencoder lavc audio encoding support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11376 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-03 16:35:40 +00:00
alex b32c67928a some updates in muxer api
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11223 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-22 17:04:39 +00:00
alex 2283b6305f Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10595 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-13 16:29:32 +00:00
alex 1c5251d47f sync the basic mplayer and mencoder outputs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10454 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-22 10:46:22 +00:00
alex 8dbd85b924 copyright message rework, try 2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10418 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-13 15:39:52 +00:00
arpi ed9296d845 renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10273 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-09 12:15:48 +00:00
mosu d9beced7e6 Support for selecting the audio track in Matroska files via -alang.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10168 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-23 15:01:25 +00:00
henry 3f4505eabb support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9871 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-07 16:04:02 +00:00
faust3 a66cc22948 MINGW32 port
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9773 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-31 17:32:46 +00:00
albeu 5787833ca9 Stream cleanup, don't use blah_on options anymore.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9747 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-30 17:07:31 +00:00
henry 3bb75e793f fix wrong channel count w/ pcm encoding
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9726 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-29 16:47:20 +00:00
arpi 5c49cd8e07 this is a combo patch that:
1) adds an experimental TS demuxer to mplayer
2) adds an input (streaming) interface from DVB cards.
It compiles and runs with the following versions of the drivers:
dvb-kernel (HEAD) (with stock kernel 2.4.20) and 0.9.4 (with kernel 2.4.18)
patch by Nico <nsabbi@libero.it>
some cleanups, ts demuxer fixes by me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9611 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-16 20:13:28 +00:00
albeu 7ff65cb40a 1000L i forgot mencoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9596 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-15 18:50:58 +00:00
rsf c9dd54daf9 Made "force_fps" non-static, because code in "libmpdemux" refers to it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9565 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-11 19:03:31 +00:00
albeu b9fab7021c A new nuppel video encoder. Mainly for RT encoding on slow box.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9521 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-03 11:03:19 +00:00
arpi 7ff83a7181 linux->osdep
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9381 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-09 20:18:23 +00:00
rfelker c8091743e1 ability to disable the nonsense expand filter is a must! otherwise
it's impossible to render subtitles earlier in the filter chain and
then scale them down with a scale filter; huge subs will get rendered
again on top!! (think dvd/vobsub where you can't just use smaller font
size) if anyone has a better way to handle this, do it! (e.g. make it
so that the first expand filter disabled osd for the rest of the
filter chain)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9077 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-24 01:04:50 +00:00
arpi 489b07338c Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
patch by Andriy N. Gritsenko <andrej@lucky.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9015 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-19 01:48:52 +00:00
arpi 970435ce12 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
inspired by patch by Fabian Franz <FabianFranz@gmx.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9007 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-19 00:21:54 +00:00
arpi 66e6173c0c AltiVec detection code ("borrowed" from FFmpeg and
libmpeg2) & enough code to enable the AltiVec IMDCT
    in liba52 and the DCT64 in mp3lib.
patch by Romain Dolbeau <dolbeau@irisa.fr>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9004 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-18 19:29:46 +00:00
arpi 1637b36c9a 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8967 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-16 23:03:06 +00:00
arpi 89875edb32 this patch adds an fallback to playlist (any but the plaintext-list format)
after all demuxers failed. so -playlist is not needed any more!
patch by Fabian Franz <FabianFranz@gmx.de>, with some small modifications


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8926 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-12 19:41:38 +00:00
arpi 308c05501e 10l...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8798 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-05 14:35:35 +00:00
arpi 0b21347be7 -nosound warning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8797 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-05 14:18:53 +00:00
filon 45fde049dd 10l :-))
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8732 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-03 11:51:39 +00:00
arpi 526ddd9235 "MPlayer does the right thing, presents frame 9 for 1.1 seconds, and continues
with frame 20. MEncoder calculates the right "frame_time", but duplicates the
frame following the gap, i.e. frame 20 is presented for 1.1 seconds."
patch by Jan Kritzner <kritzner@i4.informatik.rwth-aachen.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8599 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 12:51:05 +00:00
arpi bf46a109ed the long-waited MUXER layer, and new MPEG-PS muxer
patch by Andriy N. Gritsenko <andrej@lucky.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8586 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 22:43:20 +00:00
arpi 57e462a04f Presets are an easy way, to use hard to access lame options and to give
you optimum quality at average bitrate. This patch adds presets to mencoder
for libmp3lame >= 3.92.
More info in the sourcecode & at http://www.mp3dev.org/mp3/doc/html/presets.html
patch by eviv bulgroz <ebulgroz@yahoo.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8518 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-21 22:16:49 +00:00
arpi 8dc0ce2ade Sorenson 1/3 encoding just for fun :)
ve_qtvideo code by Sascha Sommer
SVQ3 support hack by /me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8472 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-16 01:49:39 +00:00
arpi d2392f8436 Fallback to builtin (generated from etc/codecs.conf at compile time)
codecs.conf if no ext configfile found.
Based on patch by Sidik Isani <lksi@cfht.hawaii.edu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8468 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-15 23:45:19 +00:00
arpi 521edee4c8 1l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8466 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-15 19:08:11 +00:00
arpi b987127e0e compiler warning fixes
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8452 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-14 17:56:35 +00:00
arpi 268b2c1a0f overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8362 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:03:35 +00:00
arpi 02bdc0ebfb fixed -fps with mencoder and fixed-rate files (avi etc)
patch by Ivan Szanto <szivan@duticai.TWI.TUDelft.NL>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8358 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-04 23:37:17 +00:00
arpi 89ff69732f end_at int->double, as option -endpos accepts float seconds too
patch by eviv bulgroz <ebulgroz@yahoo.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8356 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-04 23:34:29 +00:00
albeu 126725660d New config system + cleanup of header inter dependency
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8165 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-12 01:56:42 +00:00
arpi f859d013a8 *HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-06 23:54:29 +00:00
colin f51f53d042 fix sound encoding on BE arch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8076 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-03 09:54:49 +00:00
rfelker 49f52e877d removed -pass nonsense from mencoder! it's now a suboption to -divx4opts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8033 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-02 02:44:19 +00:00
arpi ec12b2922c cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
instead doing it in demux_avi.c, storing private data in priv insteda of
demuxer structs)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8031 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-02 00:45:12 +00:00
arpi 39fe4d0cd3 verbose can be negative
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8028 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-01 17:46:45 +00:00
arpi 12bf06a1ad allow cache to be disabled (-nocache should override cachesize autodetection
in stream layer)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7882 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-23 22:07:29 +00:00
arpi f9e3a4bf88 cleanup config option handling in libmpdemux.
removed overcompilacted m_config_register_options() mess - export the
subconfig structs instead


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7868 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-23 17:21:01 +00:00
diego 8f12b9b42b Fixed two typos noticed by Sycotic Smith (I think).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7806 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-19 20:26:04 +00:00
arpi 158093702c setting the keyframe flag for every audio chunks, fixes streamcopy'd ac3 on windows
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7710 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-10 21:04:42 +00:00
arpi 58bf423ca9 reversed Anders' nonsense change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7644 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-06 23:24:36 +00:00
anders 735de60232 Adding -format and -af switches
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7615 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-06 11:23:02 +00:00
arpi 3605b121ab 11l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7614 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-06 10:49:41 +00:00
arpi 3053a8b7f2 aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7605 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-05 22:55:45 +00:00
arpi eb7eb4bdde some cleanup - made private vars/funcs static, removed obsolete externs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7560 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-29 19:26:40 +00:00
arpi b124a4f9f9 removed obsolete/unused audio|video_fm|codec, has_audio|video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7530 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-28 18:45:47 +00:00
pontscho 253c9833b7 - fix new afm/vfm support
- fix fullscreen with xv
- add cache support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7527 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-28 18:03:34 +00:00
arpi dbf0fe78c6 -ac/-afm rewrite, now works the same way as -vc/-vfm
including audio codec fallbacks if init failed


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7523 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-28 02:23:20 +00:00
arpi 50de15356a -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
*, ie search all codecs. codec name starting with - disables the codec.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7507 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-26 01:31:18 +00:00
arpi 1fbd3baf78 best audio/video codec selection & init moved to libmpcodecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7503 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-25 23:45:34 +00:00
arpi 266037ca2b fixed order of uninit (codec, demuxer, stream) - found by Jindrich Makovicka
<makovick@kmlinux.fjfi.cvut.cz>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7498 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-25 20:27:34 +00:00
jaf b1d046bc9c now also tells about 2x xxx MB CDs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7481 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-22 13:37:11 +00:00
arpi d483a015a2 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-22 02:33:28 +00:00
arpi 61c5a99851 wine headers cleanup
- WAVEFORMATEX & BITMAPINFOHEADER decl moved to stheader.h
- lots of useless include wine/* removed from mplayer code
- fixed few warnings


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7472 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-22 00:43:14 +00:00
kmkaplan 32e6696306 Support for XviD encoding
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7458 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-21 12:41:29 +00:00
arpi ebf6cc4c1a some mpcodecs option declaration moved to cfg-*, as aren;t used by
mencoder/mplayer core


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7452 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-20 18:54:22 +00:00
arpi bc4ed37935 reversed -ss behaviour (you have to use teh same -ss for all passes)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7395 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-14 10:47:34 +00:00
arpi fa88cdfdbd count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7371 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-10 23:19:20 +00:00
kmkaplan ff40d7482e Import transcode-0.6.1.20020829 XviD VBR Library into mencoder DivX4 encoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7332 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-09 11:47:54 +00:00
arpi d8edb8566c warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7221 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-01 14:30:55 +00:00
arpi b9a16d87f3 seek frameno.avi too - idea by cpro@posta.unizar.es
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7213 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-31 22:29:28 +00:00
arpi 250521d437 10l - use NULL instead of -1 for init_video's vfm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7208 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-31 18:24:56 +00:00
atmos4 a63ea1a018 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
Patch by Donnie Smith <xc0bead2d8130df59@f4n.org>, updated by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7202 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-31 15:04:18 +00:00
arpi 1b667f61ba -afm/-vfm migration from ID (int) to NAME (string) - simplifies code and makes dlopen()'ing possible
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7181 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-30 21:44:20 +00:00
arpi 39f2bf39d5 new mencoder option -info, to store copyright, title, encoder version etc in AVI
based on patch by "Andriy N. Gritsenko" <andrej@lucky.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7146 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-29 20:50:49 +00:00
alex 64bedd9683 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7125 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 21:32:32 +00:00
arpi fd44bbee3d freetype 2.0/2.1+ support - disabled by default until bugs fixed
patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7123 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 20:52:02 +00:00
arpi a5bd36cf4b new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
- multithreaded audio/video buffering (I know mplayer crew hates threads
  but it seems to me as the only way of doing reliable a/v capture)
- a/v timebase synchronization (sample count vs. gettimeofday)
- "immediate" mode support for mplayer
- fixed colorspace stuff - RGB?? and YUY2 modes now work as expected
- native ALSA audio capture
- separated audio input layer


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7059 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-21 21:31:20 +00:00
jaf 4c1f3fd6d0 messages moved from mencoder.c to helpmp??.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6948 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-07 18:24:25 +00:00
jaf 34c490baf0 using help_mp-??.h for one message
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6947 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-07 09:08:10 +00:00
arpi f429ecfeba no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6924 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-05 13:41:32 +00:00
arpi 26398539cb count blocks by rounded-up chunksizes instead of chunks -
we need full emulation of dshow avi demuxer bugs :(
fixes silly nandub-style a-v delaying in avi with vbr mp3...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6872 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-02 17:44:16 +00:00
arpi f7f058b6e1 audio preload/density/delay configurable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6862 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-01 08:39:33 +00:00
atmos4 7549813fbe DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6785 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-25 03:37:28 +00:00
arpi 163942981f 10l fix, by Rémi Guyomarch <rguyom@pobox.com> && Björn Sandell
<biorn@dce.chalmers.se>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6766 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-21 22:20:05 +00:00
arpi f549b66aea fix for interlaced (2 fields) mpeg2 streams:
- accept frame skip caused by the codec
- do timer correction after calculating frame skip/dup count


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6722 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-12 18:03:16 +00:00
kmkaplan 25c6f96f62 Fix Vobsub output synchro.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6706 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-11 18:48:43 +00:00
atmos4 f1a69972e9 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6675 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-08 21:44:51 +00:00