summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
* 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
* 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
* Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-075-8/+8
| | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: MUSEPACK --> CONFIG_MUSEPACKdiego2008-08-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27427 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename font-related preprocessor directives.diego2008-08-071-3/+3
| | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename a bunch of miscellaneous preprocessor directives.diego2008-08-071-1/+1
| | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename all preprocessor directives related to Apple / Mac OS X.diego2008-08-061-1/+1
| | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename preprocessor directives related to image libraries.diego2008-08-052-3/+3
| | | | | | | Change a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-1/+1
| | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change a bunch of codec-specific preprocessor directives from a HAVE_diego2008-08-024-11/+11
| | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;diego2008-08-011-3/+3
| | | | | | | CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start unifying names of internal preprocessor directives.diego2008-07-3012-31/+31
| | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* changed 'Audio file' to 'Audio only' (to not get 'Audio file file' when played)ptt2008-07-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27365 b3059339-0415-0410-9bf9-f77b7e298cf2
* add ffvp6a codeccompn2008-07-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27356 b3059339-0415-0410-9bf9-f77b7e298cf2
* add ffmotionpixels codeccompn2008-07-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27355 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of horrible code that relies on codec-set context variable,reimar2008-07-261-25/+8
| | | | | | | | it is useless anyway since all the necessary information is available anyway. This also makes MPlayer display the correct length for Theora-in-Ogg-Videos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27354 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid including avcodec.h in demuxer.h (and thus many other files) just to getreimar2008-07-176-23/+26
| | | | | | | | | FF_INPUT_BUFFER_PADDING_SIZE. Instead use MP_INPUT_BUFFER_PADDING_SIZE and add a preprocessor check that it is big enough. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27314 b3059339-0415-0410-9bf9-f77b7e298cf2
* limits.h is required for UINT_MAXreimar2008-07-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27305 b3059339-0415-0410-9bf9-f77b7e298cf2
* And a 1000l for r27263, swapped a condition, thus setting size toreimar2008-07-161-1/+1
| | | | | | | 0 when malloc succeeded instead of when it failed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27304 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, fix calloc being called with the wrong argument due to reorderingreimar2008-07-161-1/+1
| | | | | | | two lines in SVN r27263 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27303 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure demuxed ASF packet is properly padded after descramblingreimar2008-07-161-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27302 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move duplicate FF_INPUT_BUFFER_PADDING_SIZE handling into demuxer.hreimar2008-07-165-26/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27301 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not just print a warning, also fix the len in ASF demuxer!reimar2008-07-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27299 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change a broken check. FFMAX does not work as intended because ↵reimar2008-07-141-2/+2
| | | | | | | | | trak->chunkmap[i].first is unsigned and j is signed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27280 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, do not use macros on functions that are not idempotentreimar2008-07-131-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27275 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reindent after last commitreimar2008-07-111-9/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27266 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check size of tkdata before using it in mov demuxer.reimar2008-07-111-0/+2
| | | | | | | Fixes bug #1170 and others. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27265 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add atom_len sanity check to mov demuxer.reimar2008-07-111-0/+1
| | | | | | | Fixes bug #1168 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27264 b3059339-0415-0410-9bf9-f77b7e298cf2
* Quick hack to fix demux_mov crashes where easily possible.reimar2008-07-111-16/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27263 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000l, fix demux_lavf compilationreimar2008-07-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27251 b3059339-0415-0410-9bf9-f77b7e298cf2
* Correct stream-seekability tests in demux_audio and demux_lavfreimar2008-07-112-2/+2
| | | | | | | Based on a patch by Alexander Kanavin (alexander.kanavin nokia com) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27250 b3059339-0415-0410-9bf9-f77b7e298cf2
* Only read wav header cbSize when there is enough space in header.reimar2008-07-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27249 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, assignment introduced in r27246 was exactly the wrong way around.reimar2008-07-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27248 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: reindentreimar2008-07-101-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27247 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up reading of wav extradata.reimar2008-07-101-7/+3
| | | | | | | Fixes bug #1135 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27246 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix stupid and almost pointless check-after-read code in asfheader.c.reimar2008-07-091-3/+3
| | | | | | | Fixes bug #1133. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27243 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use correct PRIu64 length modifier for uint64_t value, fixes the warning:diego2008-07-081-1/+1
| | | | | | | libmpdemux/mpeg_packetizer.c:61: warning: format '%lu' expects type 'long unsigned int', but argument 6 has type 'uint64_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27233 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for MLP audio through FFmpeg.diego2008-07-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27232 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add standard license header for NuppelVideo, i.e. GPL v2+.diego2008-07-061-1/+18
| | | | | | | | The code taken from NuppelVideo consists of just a bunch of struct definitions, which are not copyrightable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27224 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check stdata_len before accessing stdata. Fixes bug #1125reimar2008-07-041-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27194 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace asserts by proper conditions to allow playback of some broken butreimar2008-06-291-4/+5
| | | | | | | still playable files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27154 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure we do not use uninitialized data in case of a short read.reimar2008-06-291-0/+1
| | | | | | | Not really relevant but fixes bug #1109 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27143 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use stdata before checking its lengthreimar2008-06-291-4/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27142 b3059339-0415-0410-9bf9-f77b7e298cf2
* add support for /game-formats/psx-str/compn2008-06-242-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27133 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing #includes that are required for things used in the header.diego2008-06-172-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27095 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Remove useless parentheses, align.diego2008-06-161-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27091 b3059339-0415-0410-9bf9-f77b7e298cf2
* Chapter support for lavf demuxer.reimar2008-06-161-0/+7
| | | | | | | Patch by Anton Khirnov [wyskas gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27090 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support NULL name parameter for demuxer_add_chapter.reimar2008-06-161-1/+1
| | | | | | | Patch by Anton Khirnov [wyskas gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27089 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Break overly long lines.diego2008-06-161-97/+178
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27088 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: indentation, whitespace changesdiego2008-06-161-648/+645
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27087 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: consistent * placementdiego2008-06-161-21/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27086 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: one more if brace placement fixdiego2008-06-161-2/+1
| | | |