summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* added monkey audio file extensions to extension tableben2007-09-131-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24449 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check wLongsPerEntry before using it.reimar2007-09-131-5/+5
| | | | | | | | | | This fixes a potential crash for some values of it. As a side effect it works around broken callocs with an integer overflow vulnerability, but using MPlayer on such systems should never be assumed to be safe! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24447 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless preprocessor check, _WINGDI_H is never defined.diego2007-09-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24446 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fixes:diego2007-09-131-1/+1
| | | | | | | | | | | | | | | | | input.c: In function 'mp_input_set_section': input.c:1640: warning: suggest parentheses around assignment used as truth value input.c:1643: warning: suggest parentheses around assignment used as truth value mga_common.c: In function 'mga_init': mga_common.c:394: warning: suggest parentheses around assignment used as truth value playtreeparser.c: In function 'parse_smil': playtreeparser.c:523: warning: suggest parentheses around assignment used as truth value libmpdemux/demux_ts.c: In function 'ts_parse': libmpdemux/demux_ts.c:2795: warning: suggest parentheses around assignment used as truth value libmpdemux/demux_ts.c: In function 'demux_open_ts': libmpdemux/demux_ts.c:591: warning: 'frame_length' may be used uninitialized in this function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24444 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace constant by appropriate definereimar2007-09-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24443 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fix:diego2007-09-091-1/+1
| | | | | | | | demux_mov.c: In function 'mov_check_file': demux_mov.c:504: warning: label 'skip_chunk' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24378 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fix:diego2007-09-091-1/+1
| | | | | | | | demux_lmlm4.c: In function 'demux_lmlm4_fill_buffer': demux_lmlm4.c:215: warning: label 'hdr' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24377 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add nuv codec tag mappingreimar2007-09-091-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24375 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark lavfpref demuxer as safe, so it that it is actually used for e.g.reimar2007-09-091-1/+1
| | | | | | | nuv as it was planned. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24374 b3059339-0415-0410-9bf9-f77b7e298cf2
* added .stream_aspect to st_video_t: if non-zero and if not specified otherwisenicodvb2007-09-011-0/+1
| | | | | | | by the user the video pipeline will use it as current aspect ratio git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24319 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: typo fix UNSUPORTED --> UNSUPPORTEDdiego2007-08-283-9/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix warnings:diego2007-08-261-2/+0
| | | | | | | | | | demux_mkv.c: In function 'demux_mkv_read_chapters': demux_mkv.c:1299: warning: unused variable 'mkv_d' demux_mkv.c: In function 'handle_subtitles': demux_mkv.c:2740: warning: unused variable 'mkv_d' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24219 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split lschunks function further, it is simply too huge to do any useful ↵reimar2007-08-251-62/+72
| | | | | | | | | changes (e.g. for more proper support for multi-codec tracks). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24202 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fix:diego2007-08-251-1/+0
| | | | | | | | demux_mov.c:44: warning: redundant redeclaration of 'vo_sub' ../libvo/sub.h:64: warning: previous declaration of 'vo_sub' was here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24192 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove redundant variable declarations.diego2007-08-251-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24167 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove redundant variable declaration.diego2007-08-251-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24164 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing pixelformat conversion function prototypereimar2007-08-241-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24144 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove silly #ifdef around the complete file.diego2007-08-241-6/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24138 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation of live555 support after FFmpegs r10173.cehoyos2007-08-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24123 b3059339-0415-0410-9bf9-f77b7e298cf2
* We can support SEEK_END seeks only when stream->end_pos is knownreimar2007-08-201-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24105 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for AVSEEK_SIZE in demux_lavfreimar2007-08-201-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24104 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not seek to an invalid position.reimar2007-08-191-0/+2
| | | | | | | Patch by {emild [at] cs technion ac il} git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24102 b3059339-0415-0410-9bf9-f77b7e298cf2
* When a new subtitle stream becomes available check if it is the one thatreimar2007-08-091-0/+6
| | | | | | | | | was requested by the user and set up sub->id and sub->sh accordingly. Fixes -slang and -sid with DVD subtitles (basically only 'j' during playback could make them show). This was broken by r23786. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24042 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix detection of xan audio. -noidx or -forceidx still is necessaryreimar2007-08-011-0/+5
| | | | | | | to detect audio at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23985 b3059339-0415-0410-9bf9-f77b7e298cf2
* get rid of this idiotic i_certify_that_my_video_stream_does_not_use_b_framesmichael2007-07-311-14/+1
| | | | | | | | | muxer_lavf can now generate correct files with b frames as long as the timestamps provided to it are correct (they should be with lavc encoding, expect trouble with stream copy though) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23976 b3059339-0415-0410-9bf9-f77b7e298cf2
* make muxer store the provided timestampsmichael2007-07-311-4/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23975 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use the standard inline instead of __inlinereimar2007-07-301-15/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23935 b3059339-0415-0410-9bf9-f77b7e298cf2
* Another missed case-rangereimar2007-07-301-1/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23934 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use gnu case-range extension if it's easy to avoidreimar2007-07-301-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23933 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: misc typo fixesdiego2007-07-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23893 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove extern index_mode, it is already in demuxer.hreimar2007-07-271-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23886 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure fformat is set before usereimar2007-07-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23885 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unneeded extern variable declarationsreimar2007-07-271-8/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23884 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify: use FFMAXreimar2007-07-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23861 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some useless "extern" before function prototypesreimar2007-07-252-11/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23860 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix for bugzilla #835rtogni2007-07-241-1/+1
| | | | | | | | | | | | | | 1) set audio language preferences (on command line or in ~/.mplayer/config). (say, alang = Japanese[jpn],ja,jp,jpn,English[eng],en,eng,ko,ru,rus) 2) play a transport stream whose audio streams are not labeled -> no audio Patch by Sergey Svishchev >>> svs - ropnet ru <<< on bugzilla Blessed by nicodvb git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23855 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed bug introduced with the addition of get_ext_stream_properties()nicodvb2007-07-181-1/+1
| | | | | | | | | | | | | | | | that should close bug #843, too. Patch by John Donaghy. Explanation: The issue is that get_ext_stream_properties shouldnt be returning false when no extended stream properties are found for the stream in question because that is not an error condition ... extended stream properties are optional. The only time this function should return false is when the buffer overrun checks fail. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23823 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid crash if a non-existent audio track is selected with -aidreimar2007-07-161-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23790 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use stream_read_qword_lereimar2007-07-141-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23779 b3059339-0415-0410-9bf9-f77b7e298cf2
* add support for subtitles thru lavfaurel2007-07-131-0/+36
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23778 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix segfault if an 'strf' chunk couldn't be found in aviattila2007-07-131-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23772 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix typo in a commentaurel2007-07-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23771 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix unaligned memory access in asfheader.c, courtesy of Balatoni Deneszuxy2007-07-101-1/+1
| | | | | | | (dbalatoni AT programozo DOT hu) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23757 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100% cosmetics: reindentation and removal of trailing spacesnicodvb2007-07-081-52/+49
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23743 b3059339-0415-0410-9bf9-f77b7e298cf2
* unified the skip of header and stuffing bytes after the parsing of ↵nicodvb2007-07-081-6/+3
| | | | | | pes_extension[12] fields git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23742 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, forgot to skip the stuffing bytes eventually prepended to vc1 packets ↵nicodvb2007-07-071-0/+2
| | | | | | (identified by pes_extension2 subid) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23731 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: split separate instructions in separate linesnicodvb2007-07-071-3/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23730 b3059339-0415-0410-9bf9-f77b7e298cf2
* proper parsing of pes_extension[12] fields (replaces the previous code that ↵nicodvb2007-07-071-2/+35
| | | | | | relied on specific flags set git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23729 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add some missing frees.reimar2007-07-051-2/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23724 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpyreimar2007-07-052-4/+6
| | | | | | | instead of plain strlcat/strlcpy git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23723 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use leading underscores in multiple inclusion guards, they are reserved.diego2007-07-0215-42/+42
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
* Consistently use filename as multiple inclusion guard.diego2007-07-022-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23707 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use proper PRI?64 format stringsreimar2007-06-241-5/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23657 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused and trivial string variablereimar2007-06-241-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23655 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix format string to match actual type.reimar2007-06-241-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23652 b3059339-0415-0410-9bf9-f77b7e298cf2
* index_mode is already defined in demuxer.hreimar2007-06-241-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23650 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of: useless variable, useless cast and void * arithmeticreimar2007-06-241-8/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23648 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use AV_RL32reimar2007-06-241-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23647 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix format strings to match argument typereimar2007-06-241-19/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23646 b3059339-0415-0410-9bf9-f77b7e298cf2
* make opt argument of demux_info_get const.reimar2007-06-242-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23631 b3059339-0415-0410-9bf9-f77b7e298cf2
* pstrcpy -> av_strlcpyreimar2007-06-241-7/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23622 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove the now unused demux_mkv_change_subs functionreimar2007-06-241-39/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23620 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set demuxer->sub->sh to one of the s_streams like done for audio and video.reimar2007-06-241-24/+17
| | | | | | | | This makes the code simpler and more like the other demuxers, allowing to remove some special cases in mplayer.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23618 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix memleak due to not freeing demuxer->s_streamsreimar2007-06-231-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23612 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, last demux_mkv patch passed ints instead of pointers to them to sscanfreimar2007-06-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23611 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use sh_sub_t instead of mkv_track_t argument where possible, simplifying the ↵reimar2007-06-231-30/+30
| | | | | | code a bit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23610 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_mkv very long seek fixuau2007-06-201-1/+1
| | | | | | | | | | | | | | | | | | The seek code searching for the closest position in the index used "int64_t min_diff=0xFFFFFFFL" as the initial "further from the goal than any real alternative" value. The unit is milliseconds so seeks more than about 75 hours past the end of the file would fail to recognize the last index position as the best match. This was triggered in practice by chapter seek code which apparently uses a seek of 1000000000 seconds forward to mean "seek to the end". The practical effect was that trying to seek to the next chapter in a file without chapters made MPlayer block until it finished reading the file from the current position to the end. Fixed by increasing the initial value from FFFFFFF to FFFFFFFFFFFFFFF. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23592 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix demuxer.h multiple inclusion guarduau2007-06-201-2/+2
| | | | | | | | The "#ifndef __DEMUXER_H" / "#endif" pair did not cover the whole file. Move the #endif to the last line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23591 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless demnuxer.h include from matroska.h, it creats "hundreds" ofreimar2007-06-201-2/+0
| | | | | | | "warning: redundant redeclaration" git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23590 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify network timeout calculation.cehoyos2007-06-201-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23589 b3059339-0415-0410-9bf9-f77b7e298cf2
* Silence three warnings.cehoyos2007-06-181-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23575 b3059339-0415-0410-9bf9-f77b7e298cf2
* Stop playing at eof or if no data arrives for ten seconds.cehoyos2007-06-181-0/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23574 b3059339-0415-0410-9bf9-f77b7e298cf2
* More accurate seeking for demuxers lacking DEMUXER_CTRL_GET_TIME_LENGTH controlzuxy2007-06-171-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23572 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set subtitle type in mpg demuxer. Fixes subtitle switching with 'j'reimar2007-06-171-1/+2
| | | | | | | (previously subtitles would just disappear). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23570 b3059339-041