1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-15 19:35:49 +00:00
Commit Graph

312 Commits

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