summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* fix descrambling of asf file,iive2006-03-303-6/+8
| | | | | | | | | where signed buffer could cause erroneous values to be filled in descrable variables, add misssing check for one of these variables and restore sign of these variables as insurance that these checks will work even in such case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18002 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move global vars used for header parsing, etc to dewux->priv as it shouldalbeu2006-03-293-66/+79
| | | | | | | be. Also cleanup a bit signedness. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17993 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100L to who wrote this. Also fix broken headers while at it.albeu2006-03-291-1/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17991 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix passing qdm2 extradata to lavc decoderrtognimp2006-03-271-1/+5
| | | | | | | | It was broken in rev 1.142, that code does not behave the same as the old one in some cases git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17983 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert printfs in aviprint.c to mp_msg and give the information printingdiego2006-03-278-126/+126
| | | | | | | functions in this file a verbosity_level parameter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17978 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous extern variable declaration.diego2006-03-271-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17971 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a/v desync for real some filesrtognimp2006-03-261-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17961 b3059339-0415-0410-9bf9-f77b7e298cf2
* H264: when fixed_fps is set the framerate is expressed in fields per second, ↵nicodvb2006-03-251-0/+2
| | | | | | so it must be halved git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17953 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Shorten overly long lines, put SRCS/OBJS on individual linesdiego2006-03-251-1/+5
| | | | | | | to ease patching in the future. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17944 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert all if(verbose>X) to mp_msg_test calls.diego2006-03-2413-39/+35
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix for playing RealVideo on PPC/big endian processors. Patch by Emanuele ↵mosu2006-03-221-0/+14
| | | | | | Giaquinta (emanuele ! giaquinta () gmail ! com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17924 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, checking for NULL after dereferencing makes no sense (though what is ↵reimar2006-03-221-1/+2
| | | | | | this check for anyway?) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17914 b3059339-0415-0410-9bf9-f77b7e298cf2
* retrieve metadata from FLAC files (patch by Benjamin Zores < ben _at_ ↵aurel2006-03-201-0/+145
| | | | | | geexbox.org >) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17899 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use ptr when it's NULL. CID 89rtognimp2006-03-191-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17895 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation with stupid C++ compilers that shock on valid Calbeu2006-03-161-1/+1
| | | | | | | constructs in an extern "C" { }. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17881 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move the subread from FILE to stream_t.albeu2006-03-161-0/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17880 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a potential seek failure, fill_buffer doesn't have toalbeu2006-03-161-2/+4
| | | | | | | fill the whole buffer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17879 b3059339-0415-0410-9bf9-f77b7e298cf2
* Try several formats instead of only YV12 if no format was explicitlyalbeu2006-03-141-1/+22
| | | | | | | | requested. Patch from Benjamin Zores <ben -at- geexbox -dot- org> with a few whitespace changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17863 b3059339-0415-0410-9bf9-f77b7e298cf2
* le2me_32 is not necessary, tested by Diego on BE machinerathann2006-03-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17861 b3059339-0415-0410-9bf9-f77b7e298cf2
* in24/in32/fl32 little/big-endian QuickTime PCM audio supportrathann2006-03-131-3/+19
| | | | | | | approved by rxt git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17859 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix seeking with cache enabled on systems using fork().albeu2006-03-131-66/+68
| | | | | | | | | | | | | | The first data connection was opened at open time which happend in the main process. This prevented properly closing the connection on later seeks as they happend in the child process and the fd was still open in the parent process. The fix delay opening the data connection upon the first fill_buffer/seek. Also remove some code duplication, add a timeout on read from the control connection and a few other small fixes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17855 b3059339-0415-0410-9bf9-f77b7e298cf2
* recommitted version 1.22 + Rich's 1.25nicodvb2006-03-131-9/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17847 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation error introduced by last commitreimar2006-03-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17841 b3059339-0415-0410-9bf9-f77b7e298cf2
* unified failure case in muxer_new_muxer()nicodvb2006-03-121-22/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17840 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix feature pragma length checkreimar2006-03-121-8/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17838 b3059339-0415-0410-9bf9-f77b7e298cf2
* in fix_parameters() move assignment of audio bitrate to the proper block ↵nicodvb2006-03-121-3/+2
| | | | | | (the bitrate for video is actually hardcoded to 800000) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17835 b3059339-0415-0410-9bf9-f77b7e298cf2
* check stream->wf and stream->bih before using them in fix_parameters(). ↵nicodvb2006-03-121-0/+4
| | | | | | Fixes cid 43 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17834 b3059339-0415-0410-9bf9-f77b7e298cf2
* exit if calloc() fails; free(muxer) before returning NULL if muxer_init() ↵nicodvb2006-03-121-3/+20
| | | | | | fails (to avoid memleak). Fixes cid 173 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17832 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix cosmetics noticed during nico's 10lrfelker2006-03-121-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17831 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed C99-ism introduced with previous commitnicodvb2006-03-121-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17830 b3059339-0415-0410-9bf9-f77b7e298cf2
* check muxer != NULL before using it; closes cid 201nicodvb2006-03-121-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17829 b3059339-0415-0410-9bf9-f77b7e298cf2
* fail immediately if any of the parameters necessary to switch audio stream ↵nicodvb2006-03-121-1/+5
| | | | | | isn't set/correct; closes cid 55 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17823 b3059339-0415-0410-9bf9-f77b7e298cf2
* check sh_video before seeking; closes cid 56nicodvb2006-03-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17822 b3059339-0415-0410-9bf9-f77b7e298cf2
* close channels file before exiting dvb_get_channels() if ↵nicodvb2006-03-121-0/+1
| | | | | | malloc(dvb_channels_list) fails; closes cid 161 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17821 b3059339-0415-0410-9bf9-f77b7e298cf2
* init sh_a (new audio stream) to sh_audio (current audio stream); closes cid 241nicodvb2006-03-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17820 b3059339-0415-0410-9bf9-f77b7e298cf2
* dereference muxer->priv only after having checked muxer!=NULL in ↵nicodvb2006-03-111-1/+2
| | | | | | write_chunk(); closes cid 206 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17819 b3059339-0415-0410-9bf9-f77b7e298cf2
* init msec in mp_get_titleset_length() before using it; closes cid 251nicodvb2006-03-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17818 b3059339-0415-0410-9bf9-f77b7e298cf2
* init variable in parse_mp4_object_descriptor before using it; fixes cid 237nicodvb2006-03-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17817 b3059339-0415-0410-9bf9-f77b7e298cf2
* init delta_pts before using it; fixes cid 239nicodvb2006-03-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17816 b3059339-0415-0410-9bf9-f77b7e298cf2
* check pce_ptr before using it; fixes cid 207nicodvb2006-03-111-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17815 b3059339-0415-0410-9bf9-f77b7e298cf2
* Only MAX_STREAMS streams are allowed (cid 115)rtognimp2006-03-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17811 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix memory leak cid 176rtognimp2006-03-101-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17806 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix memory leak cid 177rtognimp2006-03-101-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17805 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix leak on read error (forgot to free demux packet)reimar2006-03-091-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17791 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix minor (i.e. unlikely to ever happen) leak when init failsreimar2006-03-091-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17790 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix potential read from an unitialized pointer (CID: 236)rtognimp2006-03-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17789 b3059339-0415-0410-9bf9-f77b7e298cf2
* in demux_ogg_read_packet initialize data to whole packet, reduces code andreimar2006-03-081-5/+2
| | | | | | | fixes missing initialization in else + header packet case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17786 b3059339-0415-0410-9bf9-f77b7e298cf2
* name array is too small, use strlcpy instead of strncpyreimar2006-03-081-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17785 b3059339-0415-0410-9bf9-f77b7e298cf2
* Missing free_demux_packet after read errorreimar2006-03-081-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17780 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix base64 encoding for basic auth according to RFC.reimar2006-03-081-4/+8
| | | | | | | Patch by Jeff D'Angelo (jcd+mplayer at psu edu). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17779 b3059339-0415-0410-9bf9-f77b7e298cf2
* missing url_free when using proxy and connect failsreimar2006-03-081-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17778 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_id == MAX_STREAMS is invalid, since counting starts with 0.reimar2006-03-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17777 b3059339-0415-0410-9bf9-f77b7e298cf2
* "i < sizeof(buf)" must be "i < sizeof(buf) - 5", since later buf[i + 5] is used.reimar2006-03-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17776 b3059339-0415-0410-9bf9-f77b7e298cf2
* If we have a tuner, use that as a reason we have audio support, and doaurel2006-03-081-3/+2
| | | | | | | | not depend on audioset. (patch by Jesse Allen <the3dfxdude _at_ gmail.com>) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17766 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reduce output verbosity in non-verbose mode, change some printf to mp_msg.diego2006-03-061-37/+37
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17757 b3059339-0415-0410-9bf9-f77b7e298cf2
* print ts_probe; 0x88 .. 0x8F in pes_private streams are not AC3 but DTS ↵nicodvb2006-03-041-2/+4
| | | | | | tracks (unsupported); save the size of the payload of the current PES packet in any case (used for ac3 detection) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17725 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch fixes pcm (twos, swot) in MOV.rtognimp2006-03-021-2/+2
| | | | | | | | | | This fix playing samples produced by ffmpeg(which set correct values), and many samples in archive. Patch by Baptiste COUDURIER | baptiste . coudurier )( smartjog . com | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17717 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed reference to inexistent extern variablenicodvb2006-03-011-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17714 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_control() returns int, not voidnicodvb2006-03-012-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17713 b3059339-0415-0410-9bf9-f77b7e298cf2
* try to get duration from the stream layer, if an implementation of ↵nicodvb2006-02-271-0/+8
| | | | | | STREAM_CTRL_GET_TIME_LENGTH is available git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17700 b3059339-0415-0410-9bf9-f77b7e298cf2
* implement STREAM_CTRL_GET_TIME_LENGTH to return the duration of the dvd ↵nicodvb2006-02-271-19/+60
| | | | | | currently playing git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17699 b3059339-0415-0410-9bf9-f77b7e298cf2
* added cur_title to dvd_priv_t in order to keep track of dvd title currently ↵nicodvb2006-02-271-0/+1
| | | | | | playing (range 1..N) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17698 b3059339-0415-0410-9bf9-f77b7e298cf2
* added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTHnicodvb2006-02-272-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17697 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add audio_delay argument to demux_mkv_seek.corey2006-02-271-3/+3
| | | | | | | Some uspecified amount of sugary caffeineated liquid to me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17696 b3059339-0415-0410-9bf9-f77b7e298cf2
* DVB channels cycling; patch by Ben Zores ben p geekbox d orgnicodvb2006-02-241-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17682 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix video delay when encoding with B-frames.corey2006-02-211-0/+2
| | | | | | | (missed this file) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17661 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix video delay when encoding with B-frames.corey2006-02-211-0/+9
| | | | | | | | | | Encoding delay is adjusted for on-the-fly during encoding. Decoding delay is compensated for by setting an appropriate dwStart on the audio stream (only in muxer_avi at this point). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17660 b3059339-0415-0410-9bf9-f77b7e298cf2
* More complete ASF MIME detection, closing bug# 248,gpoirier2006-02-201-0/+2
| | | | | | | | | | patch by Zuxy Meng < zuxy POIS meng AH gmail.com >, Approved by Bertrand Baudet, who agrees to get the cola shipment. :) Original thread: Date: Nov 2, 2005 7:11 AM Subject: [MPlayer-dev-eng] [PATCH] More complete ASF MIME detection, closing bug# 248 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17658 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allows the LIVE555 library to forces the client's port to be usedbertrand2006-02-191-1/+5
| | | | | | | | | when reading from an RTP/RTSP source. Patch from Benjamin Zores <ben@geexbox.org> and Patrick Labatut <plabatut@gmail.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17651 b3059339-0415-0410-9bf9-f77b7e298cf2
* dwStart support for mencoder.corey2006-02-192-0/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17649 b3059339-0415-0410-9bf9-f77b7e298cf2
* dwStart support for mplayer.corey2006-02-182-0/+8
| | | | | | | | | | | | | | | | | | | * 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
* Second-try commit of this patch.corey2006-02-1729-38/+39
| | | | | | | | | | | | 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
* Don't test the v4l2_input audioset field for audio capabilities but still ↵aurel2006-02-141-14/+6
| | | | | | try changing the mute setting (patch by Jesse Allen < the3dfxdude _at_ gmail.com >) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17627 b3059339-0415-0410-9bf9-f77b7e298cf2
* allow autodetection of pictures type when using mf://@file.list syntaxiive2006-02-141-3/+5