summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* demux_mkv: Some cleanup, fix duration printed at verbose levelUoti Urpala2009-03-211-154/+134
| | | | | | | | | | | Clean up demux_mkv_read_info() and demux_mkv_read_chapters() somewhat. (Why do the names of static functions have a stupid prefix like that? Didn't remove it now however). Demux_mkv_read_info() now delays printing duration information until the end of the function where we hopefully have the correct timescale for converting it to seconds. The code to calculate the duration had been fixed for that earlier but the message had not.
* Merge svn changes up to r28951Uoti Urpala2009-03-145-644/+0
|\
| * 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
* | Merge svn changes up to r28862Uoti Urpala2009-03-071-1/+2
|\|
| * 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
* | Merge svn changes up to r28690Uoti Urpala2009-02-211-1/+9
|\|
| * 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
* | Merge svn changes up to r28641Uoti Urpala2009-02-184-4/+4
|\| | | | | | | | | | | | | | | Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border macro) to use a wrapper macro in old-style VOs which do not provide a VO object argument. Before this function had an explicit global_vo argument in vo_gl/gl2. New vo_vdpau uses it too so use the same mechanism as most other functions.
| * 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
* | Merge svn changes up to r28610Uoti Urpala2009-02-161-33/+27
|\|
| * 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
* | Merge svn changes up to r28537Uoti Urpala2009-02-123-152/+66
|\|
| * 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
* | Merge svn changes up to r28461Uoti Urpala2009-02-041-7/+7
|\|
| * 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
* | Merge svn changes up to r28403Uoti Urpala2009-01-312-3/+3
|\|
| * 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
* | Merge svn changes up to r28348Uoti Urpala2009-01-231-0/+1
|\|
| * 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
* | Merge svn changes up to r28341Uoti Urpala2009-01-192-2/+2
|\| | | | | | | | | | | Conflicts: configure libmpcodecs/native/rtjpegn.c
| * 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
* | Merge svn changes up to r28310Uoti Urpala2009-01-155-21/+120
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * 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
* | Merge svn changes up to r28149Uoti Urpala2008-12-144-45/+81
|\|
| * 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
* | Merge svn changes up to r28087Uoti Urpala2008-12-0413-29/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * 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
* | demux_rtp.cpp: Add missing #includeUoti Urpala2008-12-021-0/+1
| |
* | demux_rtp.cpp: Fix compilation issuesUoti Urpala2008-12-021-3/+3
| | | | | | | | This file hadn't been updated after some API changes.
* | Merge svn changes up to r28065Uoti Urpala2008-12-024-1/+632
|\|
| * 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
* | Merge svn changes up to r27949Uoti Urpala2008-11-171-1/+1
|\| | | | | | | | | | | | | | | | | Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
| * 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
* | Merge svn changes up to r27841Uoti Urpala2008-10-282-214/+0
|\| | | | | | | | | Conflicts: mplayer.c
| * 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
* | Merge svn changes up to 27824Uoti Urpala2008-10-257-16/+21
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * 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
| | | | | | | | | | | |