Commit Graph

288 Commits

Author SHA1 Message Date
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