summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorSébastien Moutte <sebastien@moutte.net>2008-02-07 21:02:19 +0000
committerSébastien Moutte <sebastien@moutte.net>2008-02-07 21:02:19 +0000
commit37915fa611ede3dbe8e6e2e70baafb49f5c216ea (patch)
treeebdb74dc34b4e4826b73e9062f3002807583e881 /gst
parentee15d7657dd5cfc133c794a44ab89535ab8d720e (diff)
downloadgst-plugins-bad-37915fa611ede3dbe8e6e2e70baafb49f5c216ea.tar.gz
gst-plugins-bad-37915fa611ede3dbe8e6e2e70baafb49f5c216ea.tar.bz2
gst-plugins-bad-37915fa611ede3dbe8e6e2e70baafb49f5c216ea.zip
ext\neon\gstneonhttpsrc.c: Include unistd.h only if _HAVE_UNISTD_H is defined
Original commit message from CVS: * ext\neon\gstneonhttpsrc.c: Include unistd.h only if _HAVE_UNISTD_H is defined * gst\mpegvideoparse\mpegvideoparse.c: Use G_GUINT64_CONSTANT GLIB macro for constant * sys\dshowsrcwrapper\gstdshowaudiosrc.c: * sys\dshowsrcwrapper\gstdshowvideosrc.c: * sys\dshowdecwrapper\gstdshowaudiodec.c: * sys\dshowdecwrapper\gstdshowaudiodec.h: * sys\dshowdecwrapper\gstdshowdecwrapper.c: * sys\dshowdecwrapper\gstdshowdecwrapper.h: * sys\dshowdecwrapper\gstdshowvideodec.c * sys\dshowdecwrapper\gstdshowvideodec.h: Add a DirectShow decoder wrapper. * win32\MANIFEST: Add new win32 files to MANIFEST * win32\vs6\gst_plugins_bad.dsw: * win32\vs6\libgstdshow.dsp: * win32\vs6\libgstdshowdecwrapper.dsp: * win32\vs6\libgstflv.dsp: Add new projects to bad workspace
Diffstat (limited to 'gst')
-rw-r--r--gst/mpegvideoparse/mpegvideoparse.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gst/mpegvideoparse/mpegvideoparse.c b/gst/mpegvideoparse/mpegvideoparse.c
index fcaaed5f..22859d90 100644
--- a/gst/mpegvideoparse/mpegvideoparse.c
+++ b/gst/mpegvideoparse/mpegvideoparse.c
@@ -453,7 +453,7 @@ scan_keyframe (MpegVideoParse * mpegvideoparse)
* the picture header bits we are interested in. We init to 0xff so that when
* we have a valid picture start without the header bits, we will be able to
* detect this because it will generate an invalid picture type. */
- scanword = ~0LL;
+ scanword = ~G_GUINT64_CONSTANT (0);
GST_LOG_OBJECT (mpegvideoparse, "scan keyframe");
@@ -500,7 +500,8 @@ scan_keyframe (MpegVideoParse * mpegvideoparse)
scanword);
/* check picture start and picture type */
- if ((scanword & 0xffffffff00380000LL) == 0x0000010000080000LL)
+ if ((scanword & G_GUINT64_CONSTANT (0xffffffff00380000)) ==
+ G_GUINT64_CONSTANT (0x0000010000080000))
break;
size--;