1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-26 09:02:38 +00:00
Commit Graph

57 Commits

Author SHA1 Message Date
reimar
75282a6a83 Sanity-check sh_video->bih->biSize
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21985 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 18:22:07 +00:00
michael
f89822df44 dont read index if -noidx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21788 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-29 19:01:55 +00:00
reimar
77226f96ba Replace another MIN macro by FFMIN
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21548 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 12:25:25 +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
cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:02:45 +00:00
diego
a356cbcc01 Remove unused variables, patch by Stefan Huehner stefan at huehner org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 17:28:36 +00:00
rtogni
9da9317579 Fix potential integer overflows in memory allocation.
Patch by Rich and me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-04 22:41:27 +00:00
iive
37b31c74a8 make sure the indx chunk is big enough to hold the basic structure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18053 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-06 21:49:12 +00:00
reimar
9641a1433c use calloc instead of malloc - simplifies code and fixes overflow problems.
Path by Bjorn Sandell (biorn at chalmers se)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18052 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-06 20:56:35 +00:00
michael
9ec42a7e3f zero sized frames are not keyframes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18051 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-06 20:36:39 +00:00
iive
64159b23f8 Limit the number of entires to the amount that does fit into the chunk.
the function need rewrite as it assumes quite many things that are not guaranteed by the specifications.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18050 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-06 20:04:02 +00:00
albeu
42a11b39c9 100L to who wrote this. Also fix broken headers while at it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17991 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-29 19:31:31 +00:00
diego
a33158d60d Convert printfs in aviprint.c to mp_msg and give the information printing
functions in this file a verbosity_level parameter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17978 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 17:25:41 +00:00
diego
eebf08b978 Convert all if(verbose>X) to mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
aurel
f7af77f18a fix -idx with ODML files (patch by Benjamin Zores < ben _at_ tutuxclan.org >)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17565 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 00:40:35 +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
reynaldo
8970a281df libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16883 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-31 23:37:41 +00:00
henry
6844ef92d7 memleak fix by bryanwilkerson WHIRLPOOL yahoo SPOT com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15739 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-16 19:04:09 +00:00
michael
81ef1c7db5 switch from DIVX -> FMP4 fourcc for libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14767 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-22 20:24:18 +00:00
reimar
e73aadd97b Use libc qsort to sort ODML index.
Based on patch by phillip at phdcam dot com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14298 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-02 14:29:43 +00:00
reimar
a7908eba1b fix quicksort to avoid stack overflow and extreme runtimes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14288 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-31 16:02:47 +00:00
atmos4
f575dd7ee0 Index-Recovery cosmetix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13701 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-20 02:13:33 +00:00
atmos4
b9e2410e04 Recover Keyframe-Index for XviD aswell
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13672 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-18 13:16:13 +00:00
rathann
4da367942a small fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13188 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-28 20:56:56 +00:00
ranma
c95475b252 We still need to make sure the upper 16 bits of dwFlags are cleared
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12738 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-30 22:50:56 +00:00
ranma
f6c7658fef Remove borken index fixup (breaks more than it fixes)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12737 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-30 22:29:23 +00:00
ranma
6839eacc5a If we don't have a NEWAVIINDEX chunk, but have an OpenDML index,
use it even if there is no AVIX RIFF-Chunk.
(See also <40D2E910.2000708@comcast.net> "Non-seeking OpenDML AVI")


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12729 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-29 13:10:37 +00:00
ranma
4058e90588 Only use odml index for files that need it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12363 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-30 20:36:48 +00:00
alex
2681b9cd06 forgot to commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12343 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-29 06:27:30 +00:00
rfelker
36d9c35547 don't use odml when we don't have to -- the code is buggy!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12330 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-27 23:08:46 +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
10c153004d Better vprp aspect fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12054 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-22 01:42:43 +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
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
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
062f1005aa fix bih->biSize for uncompressed files too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7785 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-17 21:54:51 +00:00
arpi
367860560c 10l - do not read INDEX twice!!!
list index even if generated by mplayer (verbose>=2)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7763 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-16 21:04:19 +00:00
michael
ecb96b13f8 msmpeg4v1 indexing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6276 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-02 21:35:49 +00:00
arpi
eda0372a8d playback of 'being downloaded' files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6275 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-02 21:10:41 +00:00
arpi
c835270280 big cosmetics patch, cleanup of messages printed by mplayer and libs.
some printf->mp_msg conversion, and some debug messages moved from warn/info to v/dbg2
mplayer's output is now shorter, readable and consistent


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6139 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-20 03:25:26 +00:00
arpi
fbba89f83b big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6057 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-12 01:51:09 +00:00
albeu
4189e06396 printf to mp_msg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5934 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-02 10:40:35 +00:00
arpi
593c86af8e I hate M$. it seems that MSRLE biSize is always 40 when number of colors < 256 instead of 40+colors*4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5419 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-31 09:50:17 +00:00
arpi
0e60037ce8 AVI demuxer fixes:
- workaround for files with bad index (first chunk absolute, others relative offsets)
  (fixes many 'no video stream found' bugreports)
- check for LIST boundaries, truncate if sub-chunk wraps LIST endpos (FMP_3.avi)
- support/workaround for empty info blocks with size=3 (FMP_3.avi)
- lots of new avi info types added (from avifile source), just for fun...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4665 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-12 01:20:59 +00:00
atmos4
2ccf7d2a45 Don't read index for -forceidx and -nodix (speedup with bad media and not needed anyway)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4622 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-10 00:16:46 +00:00
arpi
e80c0bc832 more movi_end mess
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4226 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-17 21:55:17 +00:00
arpi
af094f7fbc workaround for broken 'muvi' chunks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4155 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-14 18:30:28 +00:00
arpi
bdf4a2dc07 better, nicer progress status for index generation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3782 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-27 00:37:03 +00:00
jaf
e2b276840a is itn't %, it is a byteposition of the video ...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3744 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-25 19:25:27 +00:00
atmos4
8b2f0c064d Divide by Zero fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3562 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-17 16:51:34 +00:00