summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* 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-0415-0410-9bf9-f77b7e298cf2
* clearly specify the valid substream id range, rather than using unreadable ↵nicodvb2007-06-121-2/+3
| | | | | | bitmasks (it also prevents misdetection 0xFF as valid) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23550 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't set random codec parameters for AC3/DTS in mkv.aurel2007-06-101-2/+2
| | | | | | | | | Those values are not needed anyway. This fixes stream copying from mkv with mencoder. Patch by Trent Piepho. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23534 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed functions that were used to parse mpeg12 video (no more video); ↵nicodvb2007-06-101-69/+0
| | | | | | patch by John Donaghy git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23531 b3059339-0415-0410-9bf9-f77b7e298cf2
* init ts_probe to 0 and probe up to TS_MAX_PROBE_SIZE if the parameternicodvb2007-06-091-4/+5
| | | | | | | | | is not explicitly set by the user; make the code that checks audio-only stream files respect -tsprobe git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23529 b3059339-0415-0410-9bf9-f77b7e298cf2
* added support for DTS1 audio descriptornicodvb2007-06-091-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23527 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000000l, descriptor VC-1 identifies VIDEO_VC1, not AUDIO_DTSnicodvb2007-06-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23526 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix segfault when encoding from an mkv file with embedded fonts.eugeni2007-06-071-1/+2
| | | | | | | Patch by Dominique Dumont (domi dumont at free fr). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23502 b3059339-0415-0410-9bf9-f77b7e298cf2
* Calculate pts with double precision in demux_asfuau2007-06-071-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23489 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace implicit use of fast_memcpy via macro by explicit use to allowreimar2007-06-053-8/+8
| | | | | | | for future optimization. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use 'static inline' instead of 'inline static' to avoid warningszuxy2007-06-041-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23461 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused parameter for mp_msgzuxy2007-06-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23458 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make realloc_struct inline as other functions defined in demuxer.hzuxy2007-06-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23451 b3059339-0415-0410-9bf9-f77b7e298cf2
* prog_id is an uint16_t; reported by Mario Rossi (mariofurire googlemail com)nicodvb2007-06-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23445 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use play duration instead of send duration to calculate the lengthzuxy2007-05-301-1/+1
| | | | | | | of an ASF clip. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23417 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of __attribute__((__packed__)) in Matroska demuxerreimar2007-05-281-122/+43
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23404 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: r23399 broke mov/mp4 demuxingcehoyos2007-05-281-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23402 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unused variables, patch by timwoj ieee org.diego2007-05-284-13/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set i_bps for ASF video streams according to extended stream propertieszuxy2007-05-223-2/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23375 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: fix indentation for previous commitcorey2007-05-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23339 b3059339-0415-0410-9bf9-f77b7e298cf2
* PIX_FMT_NONE is -1, not 0, so if stream->imgfmt is 0, ctx->pix_fmt getscorey2007-05-181-0/+1
| | | | | | | set incorrectly to PIX_FMT_YUV420P git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23338 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reuse AV_RL macros in ogg demuxer instead of its own overcomplicated ↵reimar2007-05-171-49/+4
| | | | | | implementations of it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23330 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make use of new AV_RL64reimar2007-05-171-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23329 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless setting of dp->len, it is already set to that value byreimar2007-05-171-1/+0
| | | | | | | new_demux_packet git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23328 b3059339-0415-0410-9bf9-f77b7e298cf2
* Pass imgfmt from lavc encoder to lavf muxer (this is needed for dv).corey2007-05-171-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23327 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add imgfmt (AKA pixel format) to muxer_stream_t so that encoders cancorey2007-05-171-0/+1
| | | | | | | pass imgfmt to muxers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23326 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix double free() in demux_asf.cuau2007-05-141-3/+1
| | | | | | | | | If demux_open_asf() fails it frees the demuxer->priv field before returning. Then demuxer.c calls demux_close_asf() which frees the field again. Fix by removing the free() in demux_open_asf(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23313 b3059339-0415-0410-9bf9-f77b7e298cf2
* add txd codec, works with ↵compn2007-05-101-0/+1
| | | | | | http://samples.mplayerhq.hu/game-formats/txd/fronten2.txd . git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23292 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix indentation broken in r23287reimar2007-05-101-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23290 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support theora in mkv. Sample: http://samples.mplayerhq.hu/Matroska/theora.mkvreimar2007-05-102-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23289 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid code duplication in mkv demuxer for standard fourcc/extradata handlingreimar2007-05-101-29/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23288 b3059339-0415-0410-9bf9-f77b7e298cf2
* Ignore comments where no '=' follows the comment name (otherwisereimar2007-05-091-1/+2
| | | | | | | | | "album_ja=..." would result in "Album: ja=..." MPlayer output). Patch by Nicolas George [nicolas george [at] ens fr]. See thread: "[PATCH] Equals in Ogg comments", Mon, 5 Mar 2007 10:50:02 +0100 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23280 b3059339-0415-0410-9bf9-f77b7e298cf2
* For DVR-MS:nicodvb2007-05-073-37/+277
| | | | | | | | | | | | extract timing information from the payload extension, set key frames, detect video frame boundaries, interpolate the average video frame time using the known informations from past frames and timestamps. Video data before the first video key frame is thrown away. Patch by John Donaghy johnfdonaghy gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23257 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation after FFmpeg r8921cehoyos2007-05-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23242 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix NULL pointer dereference in demux_mkv that happens wheneugeni2007-05-011-2/+2
| | | | | | | | demux_mkv_get_sub_lang (or demux_mkv_get_audio_lang) is called with an invalid track number. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23205 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify preprocessor directives: There is a general variable fordiego2007-04-262-3/+3
| | | | | | | static/shared FFmpeg libraries now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23139 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add general variables for either static or shared FFmpeg libraries.diego2007-04-261-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23119 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add CXX include flags to dependency file generation CFLAGS to generate correctdiego2007-04-261-0/+2
| | | | | | | dependencies for C++ source files as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23116 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Remove CONFIG_ prefix from FFmpeg library Makefile variables.diego2007-04-251-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23110 b3059339-0415-0410-9bf9-f77b7e298cf2
* Declarations and code should not be mixed.diego2007-04-253-6/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23107 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for Bethesda Software VID video.diego2007-04-251-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23106 b3059339-0415-0410-9bf9-f77b7e298cf2
* compilation fix, manually include help_mp.hods152007-04-241-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23102 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: remove duplicate space in ifdefreimar2007-04-221-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23090 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer_desc_lavf_preferred depends on USE_LIBAVFORMAT or USE_LIBAVFORMAT_SOnicodvb2007-04-221-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23087 b3059339-0415-0410-9bf9-f77b7e298cf2
* with -identify show audio and video id; patch by Andrew Savchenko (Bircoph ↵nicodvb2007-04-206-1/+16
| | | | | | list ru) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23028 b3059339-0415-0410-9bf9-f77b7e298cf2
* Ignore mp4a audio tag, it is meaningless since we get it for all mp4 filesreimar2007-04-161-0/+3
| | | | | | | regardless of actual audio codec. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23008 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use lavf_preferred mechanism to replace more extension-based detection hacksreimar2007-04-142-4/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22990 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add lavf_preferred demuxer for lavf formats we want to be probedreimar2007-04-144-5/+42
| | | | | | | | before our native demuxers and remove some now unneeded file-extension hacks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22989 b3059339-0415-0410-9bf9-f77b7e298cf2
* added :interleaving2, a better method to determine which stream whouls be ↵nicodvb2007-04-081-0/+14
| | | | | | | | | | flushed at every iteration of the loop (based on the lowest percentage of buffer used - same algo as libavformat) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22947 b3059339-0415-0410-9bf9-f77b7e298cf2
* in mpegfile_write_header(only for mpeg1/2) don't overwrite the values of ↵nicodvb2007-04-081-10/+0
| | | | | | bufsize with dwSuggestedBufferSize (those values are completely invented) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22945 b3059339-0415-0410-9bf9-f77b7e298cf2
* reindentationnicodvb2007-04-081-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22944 b3059339-0415-0410-9bf9-f77b7e298cf2
* in the system header set audio_locked/video_locked only for dvd and vcdnicodvb2007-04-081-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22943 b3059339-0415-0410-9bf9-f77b7e298cf2
* small syntax fix: muxrate is expressed in units of 400 bits/second, not 50 ↵nicodvb2007-04-081-1/+1
| | | | | | bytes per second git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22942 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start to separate bad-autodetection hacks from other stuff in extension-basedreimar2007-04-071-0/+5
| | | | | | | demuxer selection. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22938 b3059339-0415-0410-9bf9-f77b7e298cf2
* .dxa files should be handled by libavformat.diego