summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_ts.c2
-rw-r--r--libmpdemux/muxer_mpeg.c2
-rw-r--r--libmpdemux/parse_mp4.c2
-rw-r--r--libmpdemux/video.c2
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>