Commit Graph

132 Commits

Author SHA1 Message Date
reimar 0651813cb0 Apply patch for oCERT #2008-013 / CVE-2008-3827
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27675 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-30 10:44:50 +00:00
reimar 4153f4e21c Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
FF_INPUT_BUFFER_PADDING_SIZE.
Instead use MP_INPUT_BUFFER_PADDING_SIZE and add a preprocessor check that it
is big enough.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27314 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-17 17:14:12 +00:00
reimar e870f84bfb Move duplicate FF_INPUT_BUFFER_PADDING_SIZE handling into demuxer.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27301 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-16 16:18:25 +00:00
uau aa5ecdffd5 demux_real.c: Always use MP_NOPTS_VALUE for unknown pts
demux_real.c still had code that used either 0 or MP_NOPTS_VALUE for
unknown timestamps depending on correct_pts setting. It should have
been removed in svn commit 25988 "Change to always use MP_NOPTS_VALUE
(instead of sometimes 0) for unknown pts.".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26413 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:51:15 +00:00
diego 21c200e767 FFmpeg now uses different (unified) #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 15:46:36 +00:00
reimar 40dca58f37 Allow demuxers to choose a default value for correct_pts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25951 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-03 12:14:29 +00:00
reimar 5960ddb8e5 Use defines to give names to the different seek flags.
A better solution should be considered later, esp. for the many
broken demuxers that do not treat these flags correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 15:11:38 +00:00
reimar 35ef167321 Make all demuxer_desc_t const, thus moving them to .rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 16:00:39 +00:00
rtogni 2bc03fd010 Don't overread audio data
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25628 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 14:30:25 +00:00
rtogni b9a788edaa Don't dynamically allocate sub_packet_lengths[] in raac demuxing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25627 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 14:10:30 +00:00
rtogni 873a53b546 Print warning about encrypted audio tracks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25055 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-15 22:16:41 +00:00
diego db06490509 Remove unused code and fix warning:
demux_real.c:147: warning: 'skip_str' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24827 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-21 12:38:18 +00:00
reimar 05a637973d Fix format string to match actual type.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23652 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 14:08:22 +00:00
diego 56c96cec50 Declarations and code should not be mixed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23107 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 00:03:27 +00:00
nicodvb dfd0190a6d with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23028 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-20 21:49:49 +00:00
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
rtogni edf1fb46d2 Call real_fix_timestamp() after seeking, to avoid video freezing
because of wrong timestamps. Fixes seek_sample2.rmvb and others.
Patch by LR ))) hephooey ))(( gmail )( com (((


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22036 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 22:34:27 +00:00
rtogni 2669d9536a Use interleaver id to select the correct interleaver instead of guessing
it from the codec id.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22007 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-24 21:20:08 +00:00
diego 9c2d44923a Remove superfluous bswap.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 12:32:44 +00:00
rtogni 88990e297c Fix extradata passing to lavc RV20 decoder
Pass video codec extradata unchanged from demux_real, sync vd_realvid to 
the new format
Sync mkv demuxer to the changes above (cmsg24 extradata was totally 
broken before)
Detect cmsg24 size from extradata (was fixed)
Based on a patch by elupus >> elupus >a< ecce se <<


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20936 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 22:40:35 +00:00
uau d1639ced67 Change some constants in pts arithmetic from float to double.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20811 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-09 01:52:11 +00:00
uau f037400b74 Changed code that used pts=0 in demux packets to indicate "not known".
Now demux_real should be usable with -correct-pts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20810 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-09 01:42:52 +00:00
rtogni 54abc1a05e Prevent segfault if video codec init fails
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20515 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 14:26:23 +00:00
reimar 99c0130bda Quick hack to implement percent-based seeking, also fixes seeking with gmplayer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20508 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 12:32:12 +00:00
rtogni 5ec2b9ca3a Fix timestamps for streams where kf_base gets negative
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20235 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 13:35:46 +00:00
rtogni a743f34200 Remove useless assignements, thanks reimar for noticing them
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20204 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-14 00:43:28 +00:00
rtogni 1e418cb5f1 Remove old hack to search for .ar and VIDO, we know where they are
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20165 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 21:19:24 +00:00
rtogni 25b5b62319 Allows up to 8 bytes of extradata for cmsg24
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20150 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-10 22:15:01 +00:00
rtogni d64ad3f125 Fix extradata lenght when adding cmsg24 data
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20149 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-10 21:37:06 +00:00
rtogni c1fff74704 Cleanup: remove some old commented out skips
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20148 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-10 21:29:15 +00:00
rtogni af56e2e82e Fix problems on live streams with huge timestamps, causing overflows and
negative pts values. It also changes pts to double, since there is no 
enough precision in float to represent 32bit uint timestamps.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20145 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 20:00:02 +00:00
reimar 8e6272e832 Make fill_buffer function check for stream eof, fixes hang at eof (bug #580)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19966 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-24 14:26:31 +00:00
reimar 32254e3cb6 Missing part of previous patch to demux_real.c (revision 19958)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19960 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 17:00:09 +00:00
reimar b6d6af240c int->unsigned to avoid crash to sign extension, partially fixes bug #580
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19958 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 16:43:57 +00:00
rtognimp cdb97ab7e0 Fix some potential integer overflow in memory allocation (mot of these
were probably safe or disabled anyway)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18506 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-14 15:51:05 +00:00
rtognimp 5e86603495 Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18445 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-11 18:50:46 +00:00
reynaldo c03b175452 Part3 of Otvos Attila's oattila AT chello-hu mp_msg changes, with lots of modifications as usual
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18177 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 05:12:10 +00:00
reimar 97efe20cd1 always cast stream IDs to unsigned before comparing to MAX_STREAMS.
just defining them as unsigned might be a better fix though...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18107 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-15 21:09:29 +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
rtognimp b2a5c98e76 Only MAX_STREAMS streams are allowed (cid 115)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17811 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-11 16:42:46 +00:00
rtognimp a2d1fa71e8 Fix potential read from an unitialized pointer (CID: 236)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17789 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-09 22:09:03 +00:00
reimar cd94e7a740 stream_id == MAX_STREAMS is invalid, since counting starts with 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17777 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-08 13:26:36 +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
rtognimp b7ee4aff72 Print some more useful data from header in verbose mode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17402 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-15 22:00:53 +00:00
reimar 65cbd8d81b Always try to parse index chunk, no reason to check for movi_end
Also check return value of parse_index_chunk


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17395 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-14 22:47:38 +00:00
rtognimp 7598f44833 Fix printing of audio fourcc in hex format
Add explicit cast to fourcc print


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17392 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-14 19:24:55 +00:00
rtognimp 864811be2c Print audio 4cc for every stream, print 4cc of selected audio track
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17389 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-14 16:57:52 +00:00