diff options
| author |  Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:07:37 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:45:36 +0200 |
| commit | 186e5a998c8424b3c850b62d6f5755a0928cd64c (patch) | |
| tree | cabc9881fb5ed2c6dbe5f771323a55c50136a091 /stream | |
| parent | 41ac08d2b45f0f6eb369ea57604796be69200185 (diff) | |
| parent | e5ee1232c5e00e730d69cf57767b1ee3ab5b4e16 (diff) | |
Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream.h | 2 | ||||
| -rw-r--r-- | stream/stream_dvdnav.c | 2 | ||||
| -rw-r--r-- | stream/tvi_dshow.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/stream/stream.h b/stream/stream.h index 87cda3637a..46e580028a 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -225,7 +225,7 @@ inline static int stream_read(stream_t *s,char* mem,int total){ inline static unsigned char* stream_read_line(stream_t *s,unsigned char* mem, int max) { int len; - unsigned char* end,*ptr = mem;; + unsigned char* end,*ptr = mem; do { len = s->buf_len-s->buf_pos; // try to fill the buffer diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 403016b372..85d86713c2 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -733,7 +733,7 @@ int mp_dvdnav_aid_from_lang(stream_t *stream, unsigned char *language) { dvdnav_priv_t * priv = stream->priv; int k; uint8_t lg; - uint16_t lang, lcode;; + uint16_t lang, lcode; while(language && strlen(language)>=2) { lcode = (language[0] << 8) | (language[1]); diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c index e06f4dc346..4a524852cd 100644 --- a/stream/tvi_dshow.c +++ b/stream/tvi_dshow.c @@ -3312,7 +3312,7 @@ static int control(priv_t * priv, int cmd, void *arg) if (!priv->chains[1]->arpmt[0]) return TVI_CONTROL_FALSE; - samplerate = *(int *) arg;; + samplerate = *(int *) arg; for (i = 0; priv->chains[1]->arpmt[i]; i++) if (check_audio_format |