summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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 current lavf code has similar problems as the reverted code in MPlayer, and it also currently fails to provide any way to access the value of the ReadOrder field. I hope that the lavf side will be improved; if it isn't conversion can be added later. For now I'll make MPlayer default to the internal Matroska demuxer instead of the lavf one in a separate commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27550 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after libavcodec major version 52 changesuau2008-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | Some symbols were dropped or renamed, requiring corresponding changes in MPlayer. - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample. - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT. - Don't set AVCodecContext->rtp_mode (already marked unused before). - Use ff_eval2() instead of ff_eval(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2
| * demux_mkv: output correctly formated ASS packetsaurel2008-09-051-1/+38
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27529 b3059339-0415-0410-9bf9-f77b7e298cf2
| * lavf: the subtitles display duration is stored in pkt.convergence_durationaurel2008-09-041-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27525 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27514Uoti Urpala2008-09-035-17/+22
|\|
| * support E-AC-3 decoding using ffmpegaurel2008-09-012-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27514 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused GUID_t definition that also incorrectly defined GUID_DEFINEDreimar2008-08-311-14/+0
| | | | | | | | | | | | (while actually not defining GUID, only GUID_t). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27500 b3059339-0415-0410-9bf9-f77b7e298cf2
| * handle the lavfpref demuxer in the same way as the lavf oneaurel2008-08-271-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27489 b3059339-0415-0410-9bf9-f77b7e298cf2
| * prefer libavformat to demux matroska filesaurel2008-08-261-0/+1
| | | | | | | | | | | | | | I can't spot any regression anymore. If you find one, please tell me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27484 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: indentationaurel2008-08-241-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27480 b3059339-0415-0410-9bf9-f77b7e298cf2
| * use new lavf API to grab sample_aspect_ratio from the demuxersaurel2008-08-241-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27479 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add mapping for real audio and video CODEC_ID to MPlayer's fourccaurel2008-08-131-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27461 b3059339-0415-0410-9bf9-f77b7e298cf2
| * demux_lavf: fix mp_seek behavior in case of seeking erroraurel2008-08-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | When trying to seek past the end of file, the ByteIOContext expect that the stream is left in the same state as it was before the tentative seek. stream_seek() does not meet this expectation. It changes current position when seeking past the end of file. Thus, it is necessary to reset the stream to its previous state after a seek failure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27459 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27458Uoti Urpala2008-08-121-0/+1
|\|
| * fix audio in some rtsp streams, ok'd by lu_zerocompn2008-08-111-0/+1
| | | | | | | | | | | | | | | | patch by Changjin Liu - !lcj.liu!at!gmail!com! http://thread.gmane.org/gmane.comp.video.mplayer.user/56893/focus=56894 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27449 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make various functions staticUoti Urpala