3e9e4acd8d
Do not use leading underscores in multiple inclusion guards, they are reserved.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-02 22:34:45 +00:00
f36073916f
make opt argument of demux_info_get const.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23631 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 10:20:42 +00:00
4c1b6e248a
Fix demuxer.h multiple inclusion guard
...
The "#ifndef __DEMUXER_H" / "#endif" pair did not cover the whole file.
Move the #endif to the last line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23591 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-20 16:52:32 +00:00
20b298056a
Use 'static inline' instead of 'inline static' to avoid warnings
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23461 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-04 09:39:55 +00:00
991ff1be27
Make realloc_struct inline as other functions defined in demuxer.h
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23451 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-02 16:04:56 +00:00
ef91f5aad8
Add lavf_preferred demuxer for lavf formats we want to be probed
...
before our native demuxers and remove some now unneeded file-extension
hacks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22989 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-14 10:03:42 +00:00
de73d4dd97
Another round of subtitle code cleanup
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22155 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 18:25:28 +00:00
b5898c2aa6
added stream_pts to demuxer_t and demux_packet_t to hold the time value reported by the stream layer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21796 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 11:05:26 +00:00
c97dc5061d
new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21021 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 14:31:31 +00:00
96e829fc9c
added code to switch video stream
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20964 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:23:06 +00:00
48c301ddbc
Move sh_sub_t to stheader.h, where all the other sh structs are defined
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20892 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 18:38:29 +00:00
c5fa0bbf92
Make subtitle stream handling more similar to audio and video streams.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 16:15:23 +00:00
6200940dcb
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20765 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:55:49 +00:00
a46e8bb058
added definition of DEMUXER_CTRL_RESYNC
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20763 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:51:18 +00:00
1b8971d82e
Add demux_nut to MPlayer repo
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-17 09:32:28 +00:00
b7b319395e
demuxer_seek_chapter() returns informations about chapters count and name
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19484 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 19:19:00 +00:00
01602c31b3
added first revision of demuxer_seek_chapter()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19441 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 16:48:22 +00:00
1de0c3327d
Add matroska chapter seeking capability.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19348 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-06 18:55:34 +00:00
1a16cbfec3
marks several string parameters as const, as they are not modified inside the function, Patch by Stefan Huehner, stefan AT huehner-org
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19058 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 05:03:43 +00:00
e15ae9a600
Initial libass release (without mencoder support).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:26:51 +00:00
512eb68dc1
Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18939 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:02:49 +00:00
e2727ec797
Add a new video pts tracking mode, enabled by option -correct-pts.
...
This mode has the following differences:
- Video timing is correct for streams with B frames, at least with some
demuxers.
- Video filters can modify frame timestamps and insert new frames, and
removing frames is handled better than before.
- Some things are known to break, it's not usable as the default yet.
Things should work as before when the -correct-pts option is not used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18922 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 06:58:17 +00:00
9da9317579
Fix potential integer overflows in memory allocation.
...
Patch by Rich and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-04 22:41:27 +00:00
c843190441
Change common pts variables from floats to doubles. Individual demuxers
...
should be changed later.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18310 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 11:13:21 +00:00
6c4d9bfe51
4 - Implement a better way to calculate current audio pts and use it for
...
audio decoded with ad_libvorbis, ad_ffmpeg and ad_faad.
Patch by Uoti Urpala
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18243 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 10:58:40 +00:00
4b45ec30e4
3 - Move a definition of MP_NOPTS_VALUE from muxer.h to demuxer.h to
...
make it available in more files (needed for next patch).
Patch by Uoti Urpala
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18242 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 10:36:29 +00:00
1ab575101a
Second-try commit of this patch.
...
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
that mplayer/mencoder will instantly be in sync even when -delay is
specified.
I've quadruple checked this time; hopefully I haven't missed anything.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-17 01:57:41 +00:00
81317a1a79
do not forget to initialize dp->buffer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17612 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-12 17:01:30 +00:00
deacfedb48
forgotten cast (blows on gcc4)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17600 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-12 10:51:04 +00:00
7bb8f38da8
add some sanity checks to new/resize_demux_packet
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17598 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-12 09:28:09 +00:00
3f6e7ce5f5
Reverse commit of unfinished patch for passing audio_delay to the demuxers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 19:39:51 +00:00
15debd85d2
1. Include audio_delay as an argument to demux_seek.
...
2. Modify demux_seek_avi to adjust the audio/video stream positions so
that mplayer/mencoder will instantly be in sync even when -delay is
specified.
Other demuxers could be modified similarly in the future.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-07 20:22:44 +00:00
ab417b391a
function to read from a demuxer up to (and including) the specified
...
3-byte pattern.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17418 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-17 20:04:49 +00:00
8771ad0741
add a demux_peekc function that allows to just "have a look" at the next
...
byte of data from the demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16505 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-17 18:05:55 +00:00
9a684fa55f
faster mpg and much faster gxf demuxing
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16370 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-03 08:58:34 +00:00
d620029e4b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
...
accuracey may be totally fake for some demuxers (mpg), but accurate for
others.. (avi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16347 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-02 08:32:32 +00:00
0446e090b1
Allow forcing of demuxers and codecs by prepending '+'
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16322 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-30 23:56:24 +00:00
655334804b
support MPEG in GXF container with extension-based detection.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16311 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-26 17:40:02 +00:00
cd68e1618b
Demuxer modularization
...
Demuxer selection by name with -demuxer command (bakward compatible)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 19:57:47 +00:00
c54b5a06bd
musepack demuxing and decoding support (demuxing is v7 bitstream only).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15959 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-10 17:14:12 +00:00
12a755b63b
added AAC ADTS demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15721 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-13 20:40:29 +00:00
be54f4813f
adds a parameter to the switch_audio command to directly select a track.
...
Patch by kiriuja mplayer-patches at en-directo net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15286 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-28 14:43:19 +00:00
9e909f0dde
Added support of audio stream switching in the MPEG demuxer using the #-key
...
Patch by Michael Behrisch < behrisch $ informatik * hu-berlin * de >
commited with the kind blessing of D. Richard Felker III
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15047 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-03 14:08:28 +00:00
9ba19353ed
avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14694 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-13 13:39:19 +00:00
939e46626e
TwinVQ decoder and demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14277 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-29 19:51:56 +00:00
22d8dd7d32
disable demuxer_bmp,
...
that works with signle image in single file.
removing is part of vu1nerabi1ity fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14161 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-15 18:39:51 +00:00
939cfe1341
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14035 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-24 18:55:03 +00:00
c9040923b7
show ogg subtitle language on OSD, if available
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13503 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-28 14:00:49 +00:00
bddf8c6c27
Do not use globals. Put the variables into the appropriate demuxer struct instead.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13128 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-24 21:20:24 +00:00
087c4e5801
nsv (Nullsoft streaming video) demuxer
...
Patch by Reza Jelveh <reza (dot) jelveh (at) tu-harburg (dot) de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12176 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-12 14:19:12 +00:00
diego
reimar
uau
zuxy
nicodvb
ods15
eugeni
reynaldo
rtogni
rtognimp
corey
henry
gpoirier
faust3
iive
joey
mosu