Uoti Urpala
8c144171bb
Merge svn changes up to r28087
...
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
2008-12-04 01:55:52 +02:00
diego
0864f92e7a
Get rid of pointless 'extern' keywords.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
Uoti Urpala
e62517ef6a
Merge svn changes up to r28065
2008-12-02 18:02:05 +02:00
diego
c612907d1c
MNG demuxer by Stefan Schuermans, stefan blinkenarea org
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28052 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-30 13:22:34 +00:00
Uoti Urpala
0a674354b7
demux: Reset demux stream 'eof' flag after packet buffer overflow
...
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).
2008-10-04 07:37:18 +03:00
Uoti Urpala
f6dfaf26f8
Make various functions static
2008-08-12 14:57:12 +03:00
Uoti Urpala
17d3e4b36d
Merge svn changes up to r27441
...
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
2008-08-08 02:13:09 +03:00
diego
e0b1c9a6b7
Give a CONFIG_ prefix to preprocessor directives that lacked one and
...
change arbitrary prefixes to CONFIG_.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:20:50 +00:00
diego
e98e792843
10l: MUSEPACK --> CONFIG_MUSEPACK
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27427 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 11:19:54 +00:00
diego
141e81cce4
Rename a bunch of miscellaneous preprocessor directives.
...
Switch them from a HAVE_ to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 08:58:07 +00:00
diego
0a749ffdc5
Rename preprocessor directives related to image libraries.
...
Change a HAVE_ prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-05 08:47:51 +00:00
Uoti Urpala
6cce822505
Merge svn changes up to r27399
...
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
2008-08-02 22:04:35 +03:00
diego
96a506733d
Change a bunch of codec-specific preprocessor directives from a HAVE_
...
prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 16:30:32 +00:00
Uoti Urpala
04f3909a72
Merge svn changes up to r27374
...
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
2008-07-30 16:39:24 +03: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
Uoti Urpala
2d4656e070
Merge svn changes up to r27332
2008-07-21 15:03:49 +03: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
Uoti Urpala
68e70b3ec3
Merge svn changes up to r27092
...
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
2008-06-17 05:04:32 +03: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
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
Uoti Urpala
d5c868325c
Merge svn changes up to r26979
...
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
2008-06-04 08:10:48 +03: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
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
Uoti Urpala
0e757bf9da
Remove _s/_st suffix from some struct names
...
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
2008-04-25 03:34:22 +03:00
Uoti Urpala
66bd120a3a
Move dvdsub_id to options struct
...
Name the field "sub_id" as it's not specific to DVD subs.
Remove some other unused extern declarations together with dvdsub_id
from demux_mkv.c and demux_lavf.c.
2008-04-23 13:48:38 +03:00
Uoti Urpala
9b06b5ed85
Move correct_pts to options struct
2008-04-23 13:41:05 +03:00
Uoti Urpala
7039bc090a
Add option pointer to demuxers and stheader.h structs
2008-04-23 13:41:05 +03: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
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
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
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
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
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
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
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
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
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
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
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
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
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
eugeni
18e9531401
Add extradata to sh_sub_t.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25680 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 21:45:10 +00:00
eugeni
0039652a08
Deallocate audio track codecdata.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25642 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-07 14:13:50 +00:00
nicodvb
a913d90614
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25603 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-05 14:28:57 +00:00
reimar
77e2ce680b
Move ds->current=NULL; further up to the free_demux_packet.
...
This does not change behaviour in the normal case but avoids
a double-free if the function is aborted via a signal handler.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25472 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-20 11:21:02 +00:00
ulion
e34efdf167
Add demuxer functions for chapter feature.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25386 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-13 12:51:05 +00:00
ulion
24dafeee09
Fix memory leak that tmp allocated but maybe not used.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25342 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 14:43:09 +00:00
lu_zero
a1fe08b750
Make libnemesi use specific struct and DEMUXER_TYPE
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25294 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-04 13:05:25 +00:00
reimar
a47c3bec6d
Fix typos in comments to stop them hurting my eyes
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25225 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 13:35:25 +00:00
uau
1f5bb6386e
demuxer.c: Remove useless code
...
Remove "while(1) { }" around two instances of code that always do
"return" in the loop body. No functionality changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24854 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-25 19:21:24 +00:00
uau
1c5d870414
Fix missing subtitles after seeking back
...
Subtitle packets that had been demuxed but whose start time had not
yet been reached were left in the demuxer stream after seeking.
When using the default (non-libass) subtitle rendering this could
block subtitles from appearing as long as the playback position stayed
below the original one before seek. External subtitle files were not
affected.
Fixed by making seek code free all packets from the subtitle stream.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24698 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-04 02:35:34 +00:00
lu_zero
0ff4b3fd9f
libnemesi support, yet another rtsp/rtp library...
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24584 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-19 21:38:22 +00:00
diego
01d92a32ad
cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 22:38:45 +00:00
reimar
185bc3320f
When a new subtitle stream becomes available check if it is the one that
...
was requested by the user and set up sub->id and sub->sh accordingly.
Fixes -slang and -sid with DVD subtitles (basically only 'j' during playback
could make them show). This was broken by r23786.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24042 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-09 10:26:00 +00:00
reimar
5bd192c77d
Make sure fformat is set before use
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23885 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-27 20:25:43 +00:00
reimar
958fc672cb
Remove some unneeded extern variable declarations
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23884 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-27 20:22:55 +00:00
reimar
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
reimar
74047be59a
Fix memleak due to not freeing demuxer->s_streams
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23612 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-23 17:39:27 +00:00
zuxy
276394a205
More accurate seeking for demuxers lacking DEMUXER_CTRL_GET_TIME_LENGTH control
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23572 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-17 13:28:52 +00:00
reimar
6a09e8e2ed
Replace implicit use of fast_memcpy via macro by explicit use to allow
...
for future optimization.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 14:27:54 +00:00
diego
05c7a055e8
Simplify preprocessor directives: There is a general variable for
...
static/shared FFmpeg libraries now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23139 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-26 15:10:07 +00:00
reimar
b5aa994f1c
Cosmetics: remove duplicate space in ifdef
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23090 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-22 20:59:14 +00:00
nicodvb
effc6dcf23
demuxer_desc_lavf_preferred depends on USE_LIBAVFORMAT or USE_LIBAVFORMAT_SO
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23087 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-22 20:32:15 +00:00
reimar
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
diego
e085bc8dcf
Add explicit location for headers from the stream/ directory.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:36:36 +00:00
uau
c60af33716
Move the sh_audio->delay field to mpctx->delay.
...
The value is related to overall a/v sync and is not used by audio
demuxers or decoders.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22506 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 06:16:14 +00:00
rathann
45defa1aa0
Fix a few gcc warnings, approved by Diego and Reimar.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22160 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 23:46:08 +00:00
reimar
9e1add871e
Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,
...
-1 could be a perfectly valid pts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21827 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 15:24:38 +00:00
nicodvb
55303b223e
removed unused variable
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21803 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 17:24:14 +00:00
nicodvb
8558d03eb9
use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21798 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 11:09:53 +00:00
nicodvb
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
aurel
016b1cb9e5
don't compile demux_mpc.c when libmpcdec is disabled
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21783 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-28 23:44:38 +00:00