summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | | 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
* | demux: Increase max buffered packet bytes from 8 to 128 MiBUoti Urpala2008-10-041-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hard limit on the amount of buffered bytes per demuxer stream had not been increased since 2001. Since then there have been significant increases in both video bitrates (so it's easier to hit the limit) and typical memory available on a computer (so there's less reason to limit the memory used for buffering). The 8 MiB limit was too easy to hit in the case of high-bitrate video lagging behind audio, when the file is demuxed ahead to get audio packets but video has to be buffered until the decoder catches up to that point. Increase the limit to 128 MiB and remove the #ifdef for CONFIG_TV_BSDBT848 because the normal limit is now higher than the increased value under the #ifdef.
* | demux: Reset demux stream 'eof' flag after packet buffer overflowUoti Urpala2008-10-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | The eof flag is set when another demuxer stream has hit the limit on the size or count of buffered packets. This makes sense because in that error situation the calling code can not rely on being able to demux more packets from this stream, so it should rather exit or whatever instead of getting stuck trying. However the situation can improve if packets are demuxed from the other stream. In that case the eof flag should be cleared. This commit adds code to clear the flag if something is successfully read from the stream (so it's only cleared if a caller tries to read packets despite the flag being set; that's enough to fix audio sync issues after video packet buffer overflow).
* | Merge svn changes up to r27688Uoti Urpala2008-10-032-3/+3
|\|
| * 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
* | Merge svn changes up to r27682Uoti Urpala2008-10-022-1/+3
|\| | | | | | | | | | | | | | | | | Addition of the "outdir" suboption to vo_png in svn was reverted before merging. Conflicts: command.c mplayer.c
| * 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
* | Merge svn changes up to r27649Uoti Urpala2008-09-203-20/+21
|\| | | | | | | | | | | | | Conflicts: Makefile configure libvo/x11_common.c
| * 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
* | Merge svn changes up to r27573Uoti Urpala2008-09-101-5/+4
|\| | | | | | | | | Conflicts: libmpcodecs/vd_ffmpeg.c
| * 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
| *