Commit Graph

3260 Commits

Author SHA1 Message Date
diego d17f9943af Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
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
2008-08-01 20:28:58 +00:00
diego 4b141479da Start unifying names of internal preprocessor directives.
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
2008-07-30 12:01:30 +00:00
ptt aba5ea4a69 changed 'Audio file' to 'Audio only' (to not get 'Audio file file' when played)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27365 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-29 11:17:52 +00:00
compn 3069de886e add ffvp6a codec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27356 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-28 01:01:54 +00:00
compn b3978d78b2 add ffmotionpixels codec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27355 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-28 00:50:39 +00:00
reimar bf91f83022 Get rid of horrible code that relies on codec-set context variable,
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
2008-07-26 22:27:50 +00:00
reimar 4153f4e21c Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
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
2008-07-17 17:14:12 +00:00
reimar 9254d010ea limits.h is required for UINT_MAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27305 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-16 18:51:39 +00:00
reimar b422b105d7 And a 1000l for r27263, swapped a condition, thus setting size to
0 when malloc succeeded instead of when it failed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27304 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-16 17:48:34 +00:00
reimar 2f5b26277f 100l, fix calloc being called with the wrong argument due to reordering
two lines in SVN r27263


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27303 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-16 17:28:19 +00:00
reimar 4a46fcaebc Make sure demuxed ASF packet is properly padded after descrambling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27302 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-16 16:43:40 +00:00
reimar e870f84bfb Move duplicate FF_INPUT_BUFFER_PADDING_SIZE handling into demuxer.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27301 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-16 16:18:25 +00:00
reimar 3f35a38237 Do not just print a warning, also fix the len in ASF demuxer!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27299 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-16 16:06:14 +00:00
reimar 95cee5309f Change a broken check. FFMAX does not work as intended because 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
2008-07-14 15:49:59 +00:00
reimar 468f0e9763 100l, do not use macros on functions that are not idempotent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27275 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-13 16:56:00 +00:00
reimar c0455325f0 Reindent after last commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27266 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 22:04:29 +00:00
reimar d8b29c80d5 Check size of tkdata before using it in mov demuxer.
Fixes bug #1170 and others.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27265 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 22:03:01 +00:00
reimar 49ddf2e0f5 Add atom_len sanity check to mov demuxer.
Fixes bug #1168


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27264 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 21:59:17 +00:00
reimar baae5f1bdd Quick hack to fix demux_mov crashes where easily possible.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27263 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 20:22:07 +00:00
reimar 6da3883a44 1000l, fix demux_lavf compilation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27251 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:04:36 +00:00
reimar 3ee9460505 Correct stream-seekability tests in demux_audio and demux_lavf
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
2008-07-11 17:25:37 +00:00
reimar 8833f7c4ce Only read wav header cbSize when there is enough space in header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27249 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-10 20:10:11 +00:00
reimar 646838e446 100l, assignment introduced in r27246 was exactly the wrong way around.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27248 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-10 20:06:43 +00:00
reimar 6f96a10094 Cosmetics: reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27247 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-10 19:30:23 +00:00
reimar bbb598b9eb Clean up reading of wav extradata.
Fixes bug #1135


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27246 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-10 19:29:02 +00:00
reimar 80256aee5e Fix stupid and almost pointless check-after-read code in asfheader.c.
Fixes bug #1133.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27243 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-09 18:24:48 +00:00
diego 8365a97450 Use correct PRIu64 length modifier for uint64_t value, fixes the warning:
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
2008-07-08 08:17:50 +00:00
diego a77608b67a Add support for MLP audio through FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27232 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-07 12:17:46 +00:00
diego 1c010f2202 Add standard license header for NuppelVideo, i.e. GPL v2+.
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
2008-07-06 15:12:32 +00:00
reimar 869e44fdcc Check stdata_len before accessing stdata. Fixes bug #1125
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27194 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:47:31 +00:00
reimar 100554a37f Replace asserts by proper conditions to allow playback of some broken but
still playable files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27154 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 10:06:19 +00:00
reimar 2293c79521 Make sure we do not use uninitialized data in case of a short read.
Not really relevant but fixes bug #1109


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27143 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 07:34:44 +00:00
reimar d5e01cffea Do not use stdata before checking its length
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27142 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 07:25:47 +00:00
compn c191e0424b add support for /game-formats/psx-str/
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27133 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-24 12:15:31 +00:00
diego bc9ab4990b Add missing #includes that are required for things used in the header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27095 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-17 09:09:36 +00:00
diego 437b206595 cosmetics: Remove useless parentheses, align.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27091 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 17:33:55 +00:00
reimar 3e081f4563 Chapter support for lavf demuxer.
Patch by Anton Khirnov [wyskas gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27090 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 15:54:29 +00:00
reimar 80141566b6 Support NULL name parameter for demuxer_add_chapter.
Patch by  Anton Khirnov [wyskas gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27089 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 15:53:28 +00:00
diego b01b384616 cosmetics: Break overly long lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27088 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 12:54:28 +00:00
diego ed59b9030e cosmetics: indentation, whitespace changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27087 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 12:11:14 +00:00
diego 005cf981d4 cosmetics: consistent * placement
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27086 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 12:04:58 +00:00
diego d77499b1fe cosmetics: one more if brace placement fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 11:35:20 +00:00
diego 0d9f0ba013 M-x untabify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27084 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 10:52:39 +00:00
diego 057924754d cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27083 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 10:50:53 +00:00
diego 8cf83f75ee cosmetics: Split/join multiline statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27082 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 10:49:40 +00:00
diego 11b1a351b3 cosmetics: Consistently format all if, for, while constructs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27081 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 10:31:05 +00:00
diego f306f79bd0 Remove one more commented-out line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27080 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 09:51:40 +00:00
diego 90ff0f7dcc cosmetics: Make all function declarations consistent by moving the opening
braces to the next line and breaking long lines.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27079 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 09:22:41 +00:00
diego 939ee3203a Remove one more commented-out line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27078 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 09:20:59 +00:00
diego 14ecf4cdb9 Remove pointless comments and commented-out code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27077 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 08:57:47 +00:00
lu_zero e48c36a84a Unbreak audio, thanks to Uoti for the insight
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27055 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-12 21:53:48 +00:00
diego 625d77f9fc Remove unused variable, fixes the warning:
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
2008-06-08 14:50:35 +00:00
nicodvb c4df30a358 call demux_flush() where appropriate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26960 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-02 10:22:46 +00:00
nicodvb 02c779f1cf use demux_flush() where appropriate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26959 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-02 10:18:44 +00:00
nicodvb e14b550cf6 added and reused demux_flush() instead of emptying the demux_stream buffers;
patch by Bryan Henderson - giraffedata gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26958 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-02 10:17:48 +00:00
reimar cc6c63c03c Initialize sh_audio/sh_video->ds
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26908 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 17:35:38 +00:00
reimar ff6007357f Simplify/make new_sh behaviour more consistent when a stream gets redefined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26907 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 17:33:13 +00:00
reimar fba4b13c9b Cosmetics: simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26906 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 17:30:20 +00:00
reimar 158b5133ff Move native musepack demuxer further down in demuxer list
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26905 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 17:27:06 +00:00
compn 68fef9a517 add qclp fourcc
fixes http://samples.mplayerhq.hu/A-codecs/qclp/tube.3g2



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26878 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-26 13:04:07 +00:00
reimar ae94f470b2 Make internal subtitle and subtitle switching work with -audiofile
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26849 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-21 18:45:30 +00:00
reimar 2bdedd33ed Use av_alloc_put_byte instead of custom protocol.
This needs less code and less hacks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26848 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-21 18:21:05 +00:00
reimar efeb534cc8 Continue detection if it is not clear if we have a MP3 or flac file.
Fixes http://samples.mplayerhq.hu/A-codecs/MP3/01%20-%20Charity%20Case.mp3


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26844 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-21 16:07:37 +00:00
compn 3ea9517367 add ffmpeg ea maxis xa adpcm audio decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26792 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 23:31:05 +00:00
diego c4f6f66f9e cosmetics: Remove pointless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26790 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:41:00 +00:00
diego 7c0eee9bce Remove unused function, fixes the warning:
libmpdemux/demux_mkv.c:2242: warning: 'demux_mkv_reverse_id' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26784 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-15 21:25:41 +00:00
diego 26166492dc Remove unused variable, fixes the warning:
libmpdemux/demux_mkv.c:1401: warning: unused variable 'mkv_d'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26782 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-15 15:54:17 +00:00
diego fddec2a0e2 cosmetics: Break overly long lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26781 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-15 13:52:44 +00:00
diego 0c5ff8e9d9 Mark static tables const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26780 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-15 13:48:23 +00:00
diego c733664aaf Mark files that were imported from the MJPEG Tools suite as such.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26777 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 18:16:38 +00:00
diego 0c6e4c6dbd 10l: Revert license header cleanup on imported files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26776 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 18:11:45 +00:00
diego 4adf8975a1 Use standard license headers with standard formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26774 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 18:01:51 +00:00
compn 3642bdba84 add rl2 codec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26767 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 13:56:14 +00:00
compn 6d1481e91b add ffptx , works on ptx samples
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26743 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-12 02:09:47 +00:00
diego f1579b88c9 cosmetics: wording/spelling fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26734 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-11 12:03:26 +00:00
michael 5f4cface7b AVOption support for lavf demuxing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26728 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 19:29:38 +00:00
michael 2ce3df53b1 AVOptions support for lavf muxing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26727 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 19:22:41 +00:00
michael 13b723459b Replace a really ugly hack by a clean but not thread safe solution.
(no threads so no problem anyway ...)
This fixes the segfault with lavf muxing.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26722 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 17:19:18 +00:00
diego 96fa9c4e24 Mike Baker agreed to relicense his parts of the code as GPL v2+ on IRC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26680 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-07 08:01:51 +00:00
eugeni 547cc5772c Check ASF packet size before calling demux_asf_read_packet. Fixes segfault
with damaged ASF files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26644 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-02 13:33:14 +00:00
diego 7d560418f6 Remove unnecessary version.h #includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26602 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 11:03:41 +00:00
diego aaf2c51e8a Merge libmpdemux/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26523 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:05:43 +00:00
diego 6a23615946 #include base64.h with full path.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26518 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 16:49:31 +00:00
diego 9785107814 EXTRAXX_INC flags should now be added to .depend compilation,
not to the phony depend target.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26508 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 09:42:09 +00:00
reimar ea35e0563d Take audio delay into account when seeking in avisynth demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26505 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 07:50:54 +00:00
reimar 4fd37efa40 Calculate fps as double-precision to make switching to double-precision fps values easier.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26504 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 07:49:51 +00:00
diego 41be611f0a .depend has to get all the CFLAGS that the files it contains dependency
information for need.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26500 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:14:06 +00:00
diego 6c2394f0b4 Add BFI video support through FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26491 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 10:14:55 +00:00
rtogni e37a6b5b58 Revert r26412: policy violation
Mixes cosmetics and functional changes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26470 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 16:53:44 +00:00
rtogni a8717a3eee Revert r26411: policy violation
Reindent of the file is not allowed
Controversial cosmetics changes with no previous discussion
Mix cosmetics and non-cosmetic changes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26469 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 16:51:28 +00:00
reimar 11b4999712 Prefer libavformat musepack demuxer over internal one (which does not even support v8).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26455 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-16 12:03:34 +00:00
uau c9e6af5949 demux_asf: Fix operator precedence in packet length check
Change (len & 3-1) to correct ((len & 3) - 1) in packet length check.
Also change "a - 1 < b" to simpler "a <= b".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26446 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 23:04:07 +00:00
uau aa5ecdffd5 demux_real.c: Always use MP_NOPTS_VALUE for unknown pts
demux_real.c still had code that used either 0 or MP_NOPTS_VALUE for
unknown timestamps depending on correct_pts setting. It should have
been removed in svn commit 25988 "Change to always use MP_NOPTS_VALUE
(instead of sometimes 0) for unknown pts.".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26413 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:51:15 +00:00
uau dd4bde7bc3 demux_mkv.c: Mark some static tables const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26412 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:51:11 +00:00
uau 9df7df5b5a Reformat demuxer.c
Indent with "indent -kr -l79 -nut" and fix various suboptimal results
by hand. Also remove some commented-out cruft and one unnecessary case
of parentheses as in "return (r)".

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26411 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:51:08 +00:00
uau 660ba18378 Remove global demuxer_type
It was only used inside one function. Change it to a local variable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26410 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:51:05 +00:00
reimar 71ed16bbb4 Remove another two useless special-case from flac metadata reading function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26408 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:16:37 +00:00
reimar 4d4cb3a3f2 Simplify: use AV_RB24
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26407 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:14:02 +00:00
reimar 84121288c1 Remove useless checks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26406 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:11:03 +00:00
reimar 88584511ff Simplify (currently disabled) get_flac_metadata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26405 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:09:40 +00:00
uau c3f944e14a Remove unused function demux_read_data_pack
According to VCS history this function has never been used since it
was added in 2001...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26401 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 23:06:33 +00:00
diego d1ced77474 typo in filename
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26395 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 10:35:32 +00:00
diego 3ddde7648e Update comment to account for renamed header file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26393 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 09:50:24 +00:00
albeu 698142597e Split the lavf taglists out of the lavf muxer to allow using libmpmux
without libmpdemux.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26360 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:46:21 +00:00
albeu 0359e6ddfb Split the aac header parsing out of aac demuxer to allow using libmpmux
without libmpdemux.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26359 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:43:19 +00:00
albeu 64868a36cd Make stream independent of libmpdemux, the asf demuxer and streaming
code share a function and a few definitions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26357 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:32:35 +00:00
reimar 02fe2aae9f Fix lots and lots of other demuxers broken by r26301
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26331 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 14:11:48 +00:00
reimar 42234b5198 Remove another useless cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26330 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 14:07:34 +00:00
reimar 2ff97b7e85 Remove useless cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26329 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 14:07:05 +00:00
reimar af654481c0 Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoder
and also will create proper files when remuxing into e.g. AVI.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26328 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 11:09:21 +00:00
reimar e826cc2d72 Set demuxer->audio->id to avoid breakage due to r26301
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26327 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 09:19:55 +00:00
reimar 75535bba65 Set correct codec tag for raw rgb in mov, fixes
http://samples.mplayerhq.hu/mov/rawbgr24.mov


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26326 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 08:49:07 +00:00
uau 99901138ab Remove unnecessary includes
command.c: Don't include libmpcodecs/mp_image.h, libmpdemux/matroska.h
mplayer.c: Don't include libmpdemux/matroska.h
matroska.h: Remove declaration of already removed function
            demux_mkv_change_subs and stop including demuxer.h


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26313 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 15:24:53 +00:00
eugeni 7cc46c2e87 Support 'default' attribute for audio and subtitle tracks.
The first default track is chosen for playback if language-based selection
failes. Additionally, for audio tracks, the first one is chosen if there are
no default tracks at all.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26301 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-30 16:55:46 +00:00
nicodvb a6a7814471 another DCA audio identified (0x86) used in BD; patch by kirill belokurov gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26261 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-17 22:39:57 +00:00
diego 0e5800b7e5 Use HAVE_QUICKTIME instead of MACOSX preprocessor condition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26249 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-15 11:32:19 +00:00
diego 67d7fb2015 Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26175 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 23:32:01 +00:00
diego f653e52663 Only demux_lavf.o explicitly needs -I../libavcodec in CFLAGS.
Thus there is no need to use it everywhere.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26153 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 19:37:41 +00:00
diego a27f73390f Revert fixing illegal identifiers to fix compilation on MinGW. Unfortunately
these identifiers appear in Windows system headers and are thus outside our
direct control.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26141 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-02 19:38:50 +00:00
diego 80104b1757 Fix illegal identifiers starting with _ and capital letters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26138 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 10:48:29 +00:00
eugeni 36277e690e Support switching to/from nosound in demux_lavf.
Also fixes a bug when pstreams[-1] could be accessed. It happens when
switching audio tracks if mplayer was run with '-nosound'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26126 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:57 +00:00
eugeni 522ee6b783 Remove unused function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26125 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:55 +00:00
eugeni 0700038406 Reindent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26124 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:54 +00:00
eugeni 439cfd5d9e Don't select audio stream in lavf and mkv demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26123 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:52 +00:00
eugeni 377d745ae9 Set audio->sh correctly when switching audio tracks. The same for video tracks.
Demuxers almost never update audio->sh or sub->sh when swithing tracks. It is
especially bad when switching to no sound, and results in "too many audio
packets" error.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26121 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:48 +00:00
eugeni c85a382afa Don't select subtitle track in lavf and mkv demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26120 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:47 +00:00
eugeni 2c8e65329f Demuxer-independent functions for selecting tracks based on language.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26118 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:43 +00:00
eugeni 579e353b0f Remove stupid checks of free() argument.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26117 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:41 +00:00
eugeni a2fad60c7f Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
track language.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26116 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:39 +00:00
eugeni 18fea2aa49 Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio track
language when available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26115 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:37 +00:00
eugeni 85a8aa6f8e Add language info to sh_sub_t and sh_audio_t.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26114 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:33 +00:00
nicodvb e063c10ea9 in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26103 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 22:29:45 +00:00
compn 6b9a3bc1a4 sun rasterfile decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26102 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 18:30:02 +00:00
diego 21c200e767 FFmpeg now uses different (unified) #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 15:46:36 +00:00
nicodvb cec6597893 reset_fifos() resets demuxer->reference_clock to MP_NOPTS_VALUE
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26071 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-23 10:42:24 +00:00
nicodvb 98fe62b62b read the PCR of the currently playing program (if available) in demuxer->reference_clock
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26070 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-23 10:38:24 +00:00
nicodvb 8f0095af65 New member in demuxer_t: reference_clock.
If it's != MP_NOPTS_VALUE ds_fill_buffer() will keep
on demuxing until the pts of the next_pts is <= reference_clock.
It guarantees the compliance with the buffering model indicated
by the transmitter of the multiplex and a long-time stability
of playback (at least for me).
In any case up to a maximum of 64 packets are accumulated to prevent
memory hogging and leaks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26069 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-23 10:31:44 +00:00
diego 8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
eugeni 0a168fb8e0 Fix r26032: wrong sub stream id assigned to dvdsub_id.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26046 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-21 09:47:03 +00:00
eugeni cfa0af8f17 Support -slang in lavf demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26032 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-19 19:41:22 +00:00
nicodvb c19d8bdef2 when seeking in H264 an SPS *should* be a valid entry point; feel free to change it if it's wrong
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26008 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-16 11:51:41 +00:00
nicodvb fc5da18fff cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26007 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-16 11:02:04 +00:00
nicodvb e9711acb5d in ts_detect_streams() try to identify the program found based on vpid and apid if the previous attempts failed for lack of infos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26006 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-16 10:58:23 +00:00
reimar c1a683ad8c Change force_fps and force_ofps to double
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:50:34 +00:00
reimar 1b2d30c221 Change mf_fps to double
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25996 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:44:52 +00:00
diego 835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
compn 440d7d2575 add ffpcx decoder, works on my samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25993 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-13 21:36:27 +00:00
reimar df6f7b80c6 Change to always use MP_NOPTS_VALUE (instead of sometimes 0) for unknown pts.
I did not see anything obvious that would break, it if it does it should be
fixed properly once and for all.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25988 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-12 10:48:42 +00:00
nicodvb f785eba8a1 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
of letting individual demuxers and stream readers do their nasty job


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25987 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-11 22:03:34 +00:00
compn 325b472ae6 cosmetic typo fix, geneate > generate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25964 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-09 13:13:02 +00:00
reimar fa054564d7 Use AV_RB*, reduces x86_64 code size by almost 1kB.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25963 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-09 10:38:36 +00:00
nicodvb 77a9f6179c in some still unknown system format 0x82 identifies AUDIO_DTS
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25962 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-08 23:45:26 +00:00
reimar 3300ba4d46 Add speex tag
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25958 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-06 12:39:59 +00:00
rtogni 74ab56cbac Check buffer index while reading to avoid sig11
Fixes bugzilla #956


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25957 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-05 21:32:37 +00:00
reimar 40dca58f37 Allow demuxers to choose a default value for correct_pts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25951 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-03 12:14:29 +00:00
eugeni fc5c09acd7 Add support for attachments in lavf demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25932 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-30 08:10:25 +00:00
reimar 933277ac0f Add a comment to the #if 0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25926 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:44:55 +00:00
reimar 511eccaa78 Check that index is still within bounds of samples array.
Previous check is not enough and the code is not performance critical
so do it the easy way.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25922 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:14:00 +00:00
reimar 80e4c5d665 Make sure chunkmap values are within bounds when using them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25921 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:13:47 +00:00
reimar fe9225b50c Do not pointlessly read data, just skip it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25920 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:13:20 +00:00
reimar c6894da2cd Disable reading of flac metadata, mere metadata is not worth such a mess.
If you want this, fix the implementation to not crash at least occasionally,
or wait till I get bored enough to fix it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25918 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:04:46 +00:00
reimar 80d22ebb9f Properly check length of flac metadata.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25917 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:00:58 +00:00
reimar 1dc1db13a1 Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25914 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 19:05:36 +00:00
reimar 5960ddb8e5 Use defines to give names to the different seek flags.
A better solution should be considered later, esp. for the many
broken demuxers that do not treat these flags correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 15:11:38 +00:00
reimar 4134a853e4 Make mov subtitles work with -ass
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25909 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 14:30:53 +00:00
ivo f3216dba06 clarify comments/docs about lav* being the preferred place to implement new
codecs and (de)muxers, except for wrappers around external libraries and
codecs and (de)muxers requiring binary support.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25908 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 22:09:21 +00:00
reimar 194517d82a Support CODEC_ID_MOV_TEXT
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25907 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 18:29:26 +00:00
ivo 572d74b206 copy note on new demuxers and codecs to the top of the array as well to be
extra clear


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25904 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 16:03:22 +00:00
ivo 1203499e51 note on new demuxers and codecs, add them to lav* instead of libmp*
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25900 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 12:11:41 +00:00
diego fe9ec3ffdd Consistently use uppercase filename as multiple inclusion guard.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25897 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 01:32:52 +00:00
reimar 4ddc96baae Support mov subtitle format directly instead of converting to text in the demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25883 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-27 16:13:21 +00:00
reimar e4cf805580 Prefer lavf mov demuxer over our own, it should work better most of the time now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25874 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-27 09:08:54 +00:00
reimar 3560751199 Simplify init_vobsub: pass palette via extradata.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25873 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 23:52:15 +00:00
reimar 0e75f48aca 100l, inverted condition for AVSEEK_FLAG_BACKWARD
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25871 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 22:25:47 +00:00
reimar a3bb9882b7 Used wrong condition for using AVSEEK_FLAG_BACKWARD, it should depend on
relative vs. absolute, not time- vs. percent-based seek.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25870 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 22:06:36 +00:00
reimar a5d95b439d Cosmetics: remove some trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25869 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 21:45:31 +00:00
reimar 977300acd5 Add QDM2 codec identifier
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25868 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 21:41:30 +00:00
reimar da2d2bd84a Partially support vobsub subtitles from lavf demuxers (palette support missing)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25867 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 21:17:08 +00:00
nicodvb 4205c1a8b7 in the crazy ES probing code return DEMUXER_TYPE_MPEG_ES (mpeg12v) only if we have at least a couple of SEQ/GOP startcodes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25866 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 19:01:13 +00:00
nicodvb 7186ce0f76 in the PMT stream_type==0x11 indicates AAC in LATM streams, that now libfaad can decode; re-added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25865 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 18:47:39 +00:00
rtogni a27f74e98c Allow overriding the codec_tag for audio codecs, and always override
codec_tag for PCM codecs (codec_id from lavf is correct, but the 
codec_tag may be non-zero and wrong).

Also fixes bugzilla #983


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25817 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-20 12:57:53 +00:00
reimar eb6b6698a1 Fix endless loop if nAvgBytesPerSec is 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25800 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 14:43:58 +00:00
reimar fd35d1bfe3 Avoid a division by 0 if i_bps is 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25799 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 14:38:24 +00:00
diego 07c3d34644 Add name to email address.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25796 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 13:40:13 +00:00
reimar 80442027a0 Put bff_mask into muxer context instead of a global variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25748 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 21:06:30 +00:00
reimar 22f97dcd49 Mark qt default palette tables as const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25736 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 16:04:58 +00:00
reimar 35ef167321 Make all demuxer_desc_t const, thus moving them to .rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 16:00:39 +00:00
reimar df7c312313 First step towards making all demuxer_desc_t const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25734 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 15:47:24 +00:00
reimar f1df834442 Remove a useless assignment (there is an if just a few lines above
that ensures those two are already equal).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25733 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 15:41:21 +00:00
reimar b58f5adbfd Add a forgotten #ifdef USE_ASS around ass_free_track
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25730 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 13:37:19 +00:00
nicodvb 194c1219db moved pes_header from file-static to send_mpeg_pes_packet_ll()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25704 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 09:34:43 +00:00
reimar 7172339ff9 Write functions used by send_mpeg_*_packet may _not_ modify data
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25701 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 16:05:04 +00:00
reimar 16ca65e83a ps1_header and ps2_header should be const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25700 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 15:55:52 +00:00
reimar d3fb56248d Add a few "const" attributes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25699 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 15:50:06 +00:00
eugeni 46c4f6ae9f Add libass support to demux_lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25687 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 01:14:45 +00:00
eugeni 55b1facb6c Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
These attachments are passed to libass after demuxer is opened.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25686 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 01:12:39 +00:00
eugeni c0e1f353e0 Add demuxer interface for attachments.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25685 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 01:12:36 +00:00
eugeni 0d36212f39 Remove global_ass_track. Instead create an ass_track for each 't' track.
Global_ass_track obviously can not work when there is more than one 't tracks,
their lines will be mixed up.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25684 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 21:45:20 +00:00
eugeni bdb6a07d2a Move all subtitle parsing from mkv demuxer to update_subtitles().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25683 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 21:45:17 +00:00
eugeni d9d27bb8c4 Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25682 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 21:45:15 +00:00