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 /libmpdemux | |
| parent | 41ac08d2b45f0f6eb369ea57604796be69200185 (diff) | |
| parent | e5ee1232c5e00e730d69cf57767b1ee3ab5b4e16 (diff) | |
| download | mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.bz2 mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.xz | |
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 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_ts.c | 2 | ||||
| -rw-r--r-- | libmpdemux/muxer_mpeg.c | 2 | ||||
| -rw-r--r-- | libmpdemux/parse_mp4.c | 2 | ||||
| -rw-r--r-- | libmpdemux/video.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 94de6fbc28..3d15281644 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -322,7 +322,7 @@ static void ts_add_stream(demuxer_t * demuxer, ES_stream_t *es) sh_video_t *sh = new_sh_video_vid(demuxer, priv->last_vid, es->pid); if(sh) { - sh->format = IS_VIDEO(es->type) ? es->type : es->subtype;; + sh->format = IS_VIDEO(es->type) ? es->type : es->subtype; sh->ds = demuxer->video; priv->ts.streams[es->pid].id = priv->last_vid; diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 7e88686483..a4504caa99 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -538,7 +538,7 @@ static void write_mpeg2_scr(unsigned char *b, uint64_t ts) scr_ext = ts % 300ULL; ts /= 300ULL; ts &= 0x1FFFFFFFFULL; //33 bits - t1 = (ts >> 30) & 0x7;; + t1 = (ts >> 30) & 0x7; t2 = (ts >> 15) & 0x7fff; t3 = ts & 0x7fff; diff --git a/libmpdemux/parse_mp4.c b/libmpdemux/parse_mp4.c index 6e4441a17c..82b00a060c 100644 --- a/libmpdemux/parse_mp4.c +++ b/libmpdemux/parse_mp4.c @@ -23,7 +23,7 @@ #include <stdio.h> #include <inttypes.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <stdlib.h> diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 41a3d7d006..58bcc6ad76 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -3,7 +3,7 @@ #include "config.h" #include <stdio.h> -#ifdef HAVE_MALLOC_H +#if HAVE_MALLOC_H #include <malloc.h> #endif #include <stdlib.h> |