summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* In all demux_info_add calls change "name" to "title".reimar2009-05-307-7/+7
| | | | | | | | | Currently "name" and "title" are both used at random, this makes it consistent. "title" was chosen because it is less ambiguous and also the get_meta_title slave mode command uses that (there is no get_meta_name command). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29330 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify over rtsp_transport_tcp as var to hold the -rtsp-stream-over-tcp flag ↵lu_zero2009-05-251-3/+8
| | | | | | and make sure libnemesi only builds are fine git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29322 b3059339-0415-0410-9bf9-f77b7e298cf2
* whitespace cosmetics: Remove all trailing whitespace.diego2009-05-1358-1154/+1154
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of some more trailing whitespacereynaldo2009-05-121-9/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29298 b3059339-0415-0410-9bf9-f77b7e298cf2
* chunk size = 0 is valid for DATA chunks (used in live streams), don't rtogni2009-05-101-1/+1
| | | | | | | | print warning message git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29289 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add standard license header to all files in libmpdemux.diego2009-05-0861-119/+1168
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace informal GPL license header by standard GPL header.diego2009-05-081-11/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29279 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace informal LGPL header by standard LGPL license header.diego2009-05-081-6/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29278 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add prototype for mp_a52_framesize().diego2009-05-051-0/+2
| | | | | | | This fixes an implicit declaration warning when liba52 is disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29264 b3059339-0415-0410-9bf9-f77b7e298cf2
* libavformat is now the default for mov, update extension.c to match this.reimar2009-04-151-3/+3
| | | | | | | | Fixes direct playback of e.g. http://accent.gmu.edu/soundtracks/japanese7.mov which was played by the native demuxer (and that one is broken for it). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29181 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary malloc.h #includes and related #ifdeffery.diego2009-04-021-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2
* override codec tag for pcm s32le and s32be, used in movbcoudurier2009-04-021-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29124 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add config.h #include, necessary for HAVE_MALLOC_H check.diego2009-04-011-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29123 b3059339-0415-0410-9bf9-f77b7e298cf2
* Increase probe buffer size to 32kB, this makes ac3 auto-detection far more ↵reimar2009-04-011-1/+1
| | | | | | reliable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29121 b3059339-0415-0410-9bf9-f77b7e298cf2
* override lavf tag for pcm s24le, mov uses the same for s24bebcoudurier2009-03-301-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29110 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream isreimar2009-03-291-0/+4
| | | | | | | | created that matches the user-requested one. Fixes -slang and -sid with DVDs (anything that uses demux_mpg actually). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29095 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check for _WINGDI_ instead of _WINGDI_H before defining BITMAPINFOHEADERreimar2009-03-271-1/+1
| | | | | | since former works on both 32 and 64 bit MinGW git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29071 b3059339-0415-0410-9bf9-f77b7e298cf2
* map jls (jpeg-ls), thm and db (thumbnails) files to jpgcompn2009-03-211-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29025 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of DEMUXER_TYPE_NUV define, it is no longer used.reimar2009-03-091-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28915 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of nuppelvideo.h and its ugly packed struct and instead write thereimar2009-03-091-80/+0
| | | | | | | frame header directly in nuv encoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28914 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove now unused parts of nuppelvideo.hreimar2009-03-091-99/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28908 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove native nuv demuxer, it only needs more code to achieve the same thingreimar2009-03-092-463/+0
| | | | | | | as the libavformat demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28907 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variable from demux_mov.reimar2009-03-081-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28879 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix mp_msg call with too few arguments.reimar2009-03-041-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28805 b3059339-0415-0410-9bf9-f77b7e298cf2
* Be more robust against corrupted RM files that contain invalid packet lengthzuxy2009-02-191-1/+9
| | | | | | | by seeking to a known good place when index table is available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28665 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:diego2009-02-172-2/+2
| | | | | | | mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace double semicolon by single semicolon.diego2009-02-162-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a regression caused by r17933; RealMedia index tables could never be ↵zuxy2009-02-151-1/+1
| | | | | | printed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28585 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support seek in multirate RealMedia files.zuxy2009-02-151-32/+26
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28584 b3059339-0415-0410-9bf9-f77b7e298cf2
* change internal real video packetizing format to the more straight forward oneaurel2009-02-092-136/+49
| | | | | | | | see [MPlayer-dev-eng] [PATCH] cleanup/uniformize real video packetizing patch blessed by Roberto git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28503 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a couple of unused variable warnings through the av_unused attribute.diego2009-02-071-10/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28476 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert CONFIG_ZLIB into a 0/1 option.diego2009-02-072-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28475 b3059339-0415-0410-9bf9-f77b7e298cf2
* Adapt to lzo changes in libavutilreimar2009-02-021-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28448 b3059339-0415-0410-9bf9-f77b7e298cf2
* increase max subtitle stream limitcompn2009-01-281-1/+1
| | | | | | | patch by henryk (irc) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28381 b3059339-0415-0410-9bf9-f77b7e298cf2
* WORDS_BIGENDIAN is defined/undefined, not 0/1.diego2009-01-262-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28374 b3059339-0415-0410-9bf9-f77b7e298cf2
* in parse_pat() IDENTIFY program number and pmt_pidnicodvb2009-01-221-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28348 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation: s/ff_gcd/av_gcd.cehoyos2009-01-171-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28338 b3059339-0415-0410-9bf9-f77b7e298cf2
* Lots and lots of #ifdef ARCH_... -> #if ARCH_...reimar2009-01-161-1/+1
| | | | | | | | and #ifdef HAVE_MMX etc -> #if HAVE_MMX. There might be still more that need to be fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28325 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rearrange genres between numbers 53 and 63 into the correct order.diego2009-01-091-11/+11
| | | | | | | patch by Gil Kloepfer, mpldev09 kloepfer org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28283 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace reference to LICENSE file with GPL notice from said file.diego2009-01-091-1/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28282 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing 'void' keyword to parameterless function declarations.diego2009-01-051-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
* added support for manual audio substream selection out of 0xFD PES streams ↵nicodvb2009-01-041-0/+69
| | | | | | (Blueray, multistream in the same pid) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28245 b3059339-0415-0410-9bf9-f77b7e298cf2
* Code simplificationreimar2009-01-011-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28225 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make AVI demuxer more resilient against broken or incomplete files.reimar2009-01-011-2/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28224 b3059339-0415-0410-9bf9-f77b7e298cf2
* Increase MAX_PACK_BYTES from 8 or 32 MB (with/without CONFIG_TV_BSDBT848) to ↵reimar2008-12-241-4/+0
| | | | | | | | | | | always 32 MB. Firstly 32 MB is not that much with HD video and the different values depending on whether CONFIG_TV_BSDBT848 is set or not makes debugging harder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28190 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add extra checks to avoid crashes with broken vqf filesreimar2008-12-141-6/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28149 b3059339-0415-0410-9bf9-f77b7e298cf2
* license header consistency cosmeticsdiego2008-12-132-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28144 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace informal GPL notes by standard GPL header.diego2008-12-132-9/+42
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28140 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify: use AV_RL32/AV_RB32reimar2008-12-131-10/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28139 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid useless casts.reimar2008-12-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28138 b3059339-0415-0410-9bf9-f77b7e298cf2
* Warning fixes for demux_nutods152008-12-121-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28135 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove resync_audio_stream() from demux_nut seek functionods152008-12-121-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28134 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut APIods152008-12-121-14/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28133 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of pointless 'extern' keywords.diego2008-12-0313-29/+29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* MNG demuxer by Stefan Schuermans, stefan blinkenarea orgdiego2008-11-304-1/+632
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28052 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use 64 bit numbers for file positions in the seek function in audio demuxer.reimar2008-11-161-1/+1
| | | | | | | Hopefully fixes seeking in wav files in-between 2 and 4 GB. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27938 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factorize vobsub idx/extradata handling.aurel2008-10-272-214/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27841 b3059339-0415-0410-9bf9-f77b7e298cf2
* increase the max RTP packet size to 5MB as modern Elphelattila2008-10-221-1/+1
| | | | | | | | cameras do produce such huge packets. Requested by Alexandre Poltorak git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27810 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move likely/unlikely macros to libmpdemux/demuxer.h where they are used.diego2008-10-161-0/+8
| | | | | | | config.h should only contain option definitions, no logic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27786 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix double free in demux_nut, patch by Onur Küçük.ods152008-10-131-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27764 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused line (and fix an icc warning).cehoyos2008-10-091-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27739 b3059339-0415-0410-9bf9-f77b7e298cf2
* Correctly place second const in declaration.cehoyos2008-10-051-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27724 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move find_backwards_asf_guid asfguid.h to asfheader.c, the only place wherediego2008-10-052-10/+10
| | | | | | | | it is used. Fixes the following warning: ./libmpdemux/asfguid.h:94: warning: 'find_backwards_asf_guid' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27723 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix compilation w/ FFmpeg r15533gpoirier2008-10-032-3/+3
| | | | | | | patch by Andrew Wason %rectalogic A rectalogic P com% git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27688 b3059339-0415-0410-9bf9-f77b7e298cf2
* Apply patch for oCERT #2008-013 / CVE-2008-3827reimar2008-09-301-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27675 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not special-case a grouping-subsegment length of 0.reimar2008-09-251-1/+0
| | | | | | | Fixes samples/asf-wmv/quicktime.wmv git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27664 b3059339-0415-0410-9bf9-f77b7e298cf2
* riff.h and avi.h are not needed, but avio.h is.diego2008-09-151-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27616 b3059339-0415-0410-9bf9-f77b7e298cf2
* Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.diego2008-09-152-18/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27614 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make internal Matroska demuxer default againuau2008-09-091-1/+0
| | | | | | | | | | Undo Aurelien's previous commit which made the lavf demuxer the default. SSA/ASS subtitles do not work properly with the lavf demuxer at the moment. That's much more important than any issues with the internal demuxer. The internal demuxer must remain the default at least until the subtitle issues are resolved. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27556 b3059339-0415-0410-9bf9-f77b7e298cf2
* revert r27551 which break much more things than it fixesaurel2008-09-091-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27555 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use internal demuxer for Matroska files for nowuau2008-09-081-1/+0
| | | | | | | | | Change the default demuxer back to the internal one at least until the current lavf breakage with SSA/ASS subtitles is sorted out. There have also been quite a few other regressions so maybe the lavf demuxer should be tested a bit more before trying to make it the default again. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27551 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert bad changes to SSA/ASS subtitle packet formatuau2008-09-081-38/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commits are reverted partially or completely: "a valid ASS line contains 9 ',' before actual text" "demux_mkv: output correctly formated ASS packets" "libass: add a new ass_process_data() to process demuxed subtitle packets" These commits converted the internal representation of SSA/ASS subtitle packets from the format used by Matroska to a custom format where each packet has contents exactly matching one line in complete SSA script files. AFAIK no files natively use such a format for muxed subtitles. The stated reason for this change was to use a format that could in principle be muxed into a maximal number of containers. SSA subtitles do not have an implicit duration so both start time and duration or end time need to be specified explicitly; the new format moved timing information inside the codec packet data so it could be muxed without modification into containers that can represent only start time at the container level. However such a change is wrong from the viewpoint of program architecture. Timing information belongs to the demuxer level, but these commits moved not only the duration but also the authoritative value of the start time to inside the codec data. Additionally the new format lost the value of the Matroska ReadOrder field which is used by MPlayer. This commit changes the internal packet format back to that used by Matroska and makes the internal Matroska demuxer output that format again. Libavformat still outputs the "new" format; it could be converted back to the Matroska format in demux_lavf.c, but I'm not adding that code at least yet. The