Commit Graph

442 Commits

Author SHA1 Message Date
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
rfelker 98c0ee2923 reapply rawaudio muxer fix (don't disable audio without user's permission!) (previously reversed because of mistake in patch.. 10l to me :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16829 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-23 07:32:35 +00:00
rfelker a6549bd26b reverse patch that was mistakenly applied with unwanted unrelated changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16828 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-23 07:30:56 +00:00
ods15 def1404bc4 document hack
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16815 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-20 05:54:51 +00:00
rfelker 3892465935 processing audio is sometimes essential for a/v sync, so 1000l to
whoever made rawvideo muxer disable audio!!

with this patch, audio is processed but simply thrown away by the
muxer. various 'error' conditions in rawvideo muxer are removed to
make it work. feel free to re-add them if they can be done without
breaking anything, but do not use printf !!!!

btw old behavior can be obtained by manually specifying -nosound.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16806 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-19 05:44:27 +00:00
faust3 dbc1f67ca2 allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16782 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-16 19:14:09 +00:00
ods15 a38ef47cb3 cosmetics. does not change functionality, but makes code easier to read
(removes redundant switch-case)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16757 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 20:54:21 +00:00
ods15 91117f5372 weirdness, flags aren't restored right unless you add this second push
mencoder a.avi b.avi -flag c.avi

-flag should've only applied to b, but it applied to both b and c!!

No clue why this happens and more so why this solves it. but it does.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16754 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 20:27:48 +00:00
ods15 c3ea61ff6c fix mencoder multi-file with some files having audio but others dont
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16753 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 19:30:07 +00:00
ods15 fa70ed4a03 100000l to me
fixdelay() pre-read a frame to make pts sane, and then called slowseek(),
which AGAIN read another frame, and then tries to decode it (which breaks
as all frames should be read)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16709 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-08 17:21:00 +00:00
ods15 591fadadfd Make frameno.avi not turn on by default. this is deprecated and this entire
feature should be removed anyway. manpage update in a bit...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16529 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-19 19:23:38 +00:00
rtognimp cd68e1618b Demuxer modularization
Demuxer selection by name with -demuxer command (bakward compatible)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 19:57:47 +00:00
al bd342e463a Support new static libavcodec (depends on libavutil).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16166 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-01 20:16:56 +00:00
iive 84ec577508 remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16153 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-31 00:26:07 +00:00
ods15 c47ccea6f8 1000l to me. Broke compilation when EDL is disabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16066 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-23 06:51:35 +00:00
reimar 2affcd2e61 fix invalid pointers passed to init_audio_filters
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16061 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-22 21:27:54 +00:00
reimar 3c7c21274c define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16050 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-22 17:11:39 +00:00
alex a5a752770c catch HUP and PIPE signals aswell. Patch by Sergey Khlutchin (@gmail.com)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16003 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-18 19:59:03 +00:00
ods15 efee32de2b -delay for MEncoder, final step 6.
TODO: make it encode silence instead of cutting video as cutting
video is unreliable with -ovc copy.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15998 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 19:40:05 +00:00
ods15 e805f50a76 -delay for MEncoder, step 5.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15997 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 19:28:01 +00:00
ods15 78600ea9bc -delay for MEncoder, step 4.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15996 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 19:27:27 +00:00
ods15 275beee96f -delay for MEncoder, step 3.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15995 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 19:26:49 +00:00
ods15 9a3bffba61 -delay for MEncoder, step 2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15994 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 19:25:58 +00:00
ods15 0383e89616 -delay for MEncoder, step 1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15993 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 19:25:33 +00:00
reimar a40429d6ce Do not count skipped/broken frames when using -frames
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15896 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-03 10:09:09 +00:00
ranma a123c6be4c Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15889 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-02 19:00:13 +00:00
nicodvb b30b191250 -don't encode more audio than needed; -edl_skip is int, not short; -don't read audio_data to skip in mux_a->buffer; -edl_seek works on input streams, not output; -one-frame accuracy fix ; patch by Oded Shimon
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15832 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-27 19:10:11 +00:00
reimar d22ae4a4d9 make -srate work again, unify audio filter init and preinit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15812 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-24 10:50:53 +00:00
reimar 46630a96a9 strdup subtitle filename at a more appropriate place, fixing memleaks and
double frees.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15604 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-01 09:01:41 +00:00
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