summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r27399Uoti Urpala2008-08-024-14/+14
|\ | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * 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
* | Merge svn changes up to r27374Uoti Urpala2008-07-3012-55/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * 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
* | Merge svn changes up to r27332Uoti Urpala2008-07-217-44/+33
|\|
| * 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
* | Merge svn changes up to r27281Uoti Urpala2008-07-154-42/+42
|\|
| * 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
* | Merge svn changes up to r27242Uoti Urpala2008-07-093-2/+20
|\| | | | | | | | | | | | | Conflicts: Makefile configure
| * 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
* | Merge svn changes up to r27202Uoti Urpala2008-07-051-0/+4
|\|
| * 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
* | Merge svn changes up to r27184Uoti Urpala2008-07-015-8/+14
|\|
| * 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
* | Merge svn changes up to r27123Uoti Urpala2008-06-232-1/+4
|\| | | | | | | | | | | | | Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
| * 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
* | Merge svn changes up to r27092Uoti Urpala2008-06-174-44/+41
|\| | | | | | | | | | | | | | | Conflicts: libmpdemux/demuxer.c libvo/vo_xv.c mencoder.c
| * 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
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27085 b3059339-0415-0410-9bf9-f77b7e298cf2
| * M-x untabifydiego2008-06-161-24/+24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27084 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove all trailing whitespace.diego2008-06-161-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27083 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Split/join multiline statements.diego2008-06-161-4/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27082 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Consistently format all if, for, while constructs.diego2008-06-161-140/+170
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27081 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove one more commented-out line.diego2008-06-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27080 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Make all function declarations consistent by moving the openingdiego2008-06-161-42/+90
| | | | | | | | | | | | | | braces to the next line and breaking long lines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27079 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove one more commented-out line.diego2008-06-161-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27078 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless comments and commented-out code.diego2008-06-161-19/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27077 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Unbreak audio, thanks to Uoti for the insightlu_zero2008-06-121-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27055 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variable, fixes the warning:diego2008-06-081-1/+0
| | | | | | | | | | | | | | libmpdemux/demux_ts.c:3130: warning: unused variable 'd_sub' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27036 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-0413