1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 09:32:40 +00:00
Commit Graph

60 Commits

Author SHA1 Message Date
diego
e085bc8dcf Add explicit location for headers from the stream/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:36:36 +00:00
reimar
db7e024216 Support some weird AVI header, fixes bug 742
(http://samples.mplayerhq.hu/avi/samsung_crap_bug742.avi)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22166 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-06 19:01:28 +00:00
reimar
24f3a0132c 100l confused FFMIN/FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21422 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 19:43:36 +00:00
reimar
0af2daec29 Proper fix for last demux_avi commit, stream switching now really should
not hang anymore


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21421 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 19:24:42 +00:00
reimar
f32179337e Make sure we do not hang if no streams are available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21420 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 18:51:44 +00:00
reimar
d441d65f34 Implement stream switching for AVI demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21419 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 17:57:29 +00:00
reimar
15eb8639c6 Move initialization of sh_audio/sh_video members to aviheader
where possible so that all a_streams[]/v_streams[] are initialized
and switching becomes simpler.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21403 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-30 17:48:00 +00:00
diego
8619594a1d Remove duplicate message, the same info is printed anyway.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20863 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 16:03:39 +00:00
eugeni
8dc8dcf3cc Fix an obvious typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20716 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 17:32:18 +00:00
kraymer
09ebe87f57 better wording for "workarounding"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20712 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 16:49:09 +00:00
kraymer
ea922ff669 MSGTRs for demux_avi.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20711 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 16:36:02 +00:00
reimar
0aa92466a1 Allow lowercase letters in AVI stream id, fixes bug #277
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20416 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-23 16:46:16 +00:00
reimar
3b248ecf24 Avoid crash after "AVI: No audio stream found -> no sound." message,
audio was not correctly disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20343 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 20:48:41 +00:00
reynaldo
8fcccd3090 as anounced, just some cleaning, purely janitorial changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20252 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 18:36:02 +00:00
pacman
a2783c69ba Fix calculation of stream sizes when they are too big for a 32-bit variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18394 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-06 06:23:23 +00:00
corey
b4e5108496 dwStart support for mplayer.
* demux_avi sets stream_delay according to dwStart
* mplayer adjusts audio_delay according to stream_delay

3 related patches are pending, and I will apply them over the next few
days if all goes well.

As I mentioned on -dev-eng, the funny indentation is in preparation for
one of those pending patches.

See:
Date: Fri, 17 Feb 2006 00:53:28 -0800
To: mplayer-dev-eng@mplayerhq.hu
Subject: [PATCH] bframes, dwStart: individual patches


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17644 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-18 09:26:39 +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
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
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
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
reimar
3b31501ff7 fix crash if no video codec available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17343 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-08 13:35:54 +00:00
reimar
2912984517 move resync_audio_stream after seeking to demuxer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-30 09:19:05 +00:00
diego
82e1a7303f Avoid duplicated messages from demux_avi.c and demuxer.c.
patch by Luca Barbato < lu_zero -- at -- gentoo -- at -- org >


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16477 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-13 18:12:48 +00:00
ods15
d620029e4b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
accuracey may be totally fake for some demuxers (mpg), but accurate for
others.. (avi)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16347 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-02 08:32:32 +00:00
rtognimp
bf7ea6175a 100l: fix avi demuxing for ni and nini cases, allow forcing ni and nini
demuxers


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16212 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-13 12:20:07 +00:00
ods15
bfae13d1db demux_avi_control() missing in avi's demuxer struct.
patch by Uoti Urpala (urpala BANG cc MEEP helsinki MEEP fi)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16200 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-11 17:23:45 +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
reimar
d147077c21 Move generic length and percent pos calculation to demuxer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14503 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-15 16:11:45 +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
rtognimp
2aa6acd974 Seek in HTTP streams and stdin seek fixes
Patch by eviv bulgroz <ebulgroz(at)yahoo(dot)com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12019 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-13 16:10:02 +00:00
attila
b603289132 enable seeking in http streams
patch by Valentine Zaretsky <valik+mplayerdev@email.dp.ua>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11966 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-17 12:30:45 +00:00
alex
aba42ce2fe Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11235 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-22 19:01:37 +00:00
arpi
c72efe2c97 printing fps with 3 dec digit instead of 2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10710 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-27 22:30:54 +00:00
arpi
42118815ee - ignore movi_end if reading from stdin
- assume I-only stream if no index (buggy seekable avi is still better than non-seekable)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9229 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-02 21:32:05 +00:00
pontscho
3a03ad6f92 upsz :))))))))))))))
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8927 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-12 19:55:59 +00:00
arpi
b618a7c596 fixed these:
- uses video time length instead of audio time length to calculate audio size in fallback
- differences in fallback for priv->numberofframes calculation
patch by eviv bulgroz <ebulgroz@yahoo.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8647 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-29 21:20:45 +00:00
arpi
ab560e0258 accurate bitrate calculation using index, and more accurate guessing
if no index available.
based on patch by eviv bulgroz <ebulgroz@yahoo.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8517 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-21 22:11:48 +00:00
michael
01c201dbe8 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8255 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-23 10:58:14 +00:00
arpi
422b0d2a4c demuxer_control(), percent position and time length query implemented in
asf, avi, mpeg demuxers.
patch by Balatoni Denes <pnis@coder.hu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8209 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-16 03:42:14 +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
arpi
173108eadf workaround old mencoder's cbr-mp3 header bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8060 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-02 21:52:48 +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
fd894b987b fix & workaround possible sig8/sig11 in blocksize calculation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7786 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-17 22:12:32 +00:00
arpi
2c23e786e5 fixed invalid -aid/-vid segfault
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7502 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-25 22:19: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
99d4526691 corrects an off-by-one error when trying to seek beyond the end of file.
patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7003 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-14 21:25:01 +00:00
arpi
e283ac5c3c detection of badly interleaved avi files and auto-switch to -ni
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6885 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-04 01:48:35 +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
albeu
419943f3c7 Add uninit to the avi demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6817 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-26 12:36:13 +00:00
arpi
9db030295b hopefully fixed last A-V sync bug, and also fixed largefile bug in debug printf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6641 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-04 22:17:30 +00:00