summaryrefslogtreecommitdiff
path: root/src/libmpeg2/vlc.h
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-04-01 13:18:21 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-04-01 13:18:21 +0000
commitc466f03689df63a5c6cbad58318551759a96b183 (patch)
tree81f598fc01e62dad07984d622f907f0c3795542f /src/libmpeg2/vlc.h
parent597b77d5cf3b65ba2a14c1ac3ffbfab74b1f5593 (diff)
downloadxine-lib-c466f03689df63a5c6cbad58318551759a96b183.tar.gz
xine-lib-c466f03689df63a5c6cbad58318551759a96b183.tar.bz2
- sync with mpeg2dec 0.2.1
- small changes to frame freeing logic CVS patchset: 1655 CVS date: 2002/04/01 13:18:21
Diffstat (limited to 'src/libmpeg2/vlc.h')
-rw-r--r--src/libmpeg2/vlc.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libmpeg2/vlc.h b/src/libmpeg2/vlc.h
index ed2e04f88..1e11e1424 100644
--- a/src/libmpeg2/vlc.h
+++ b/src/libmpeg2/vlc.h
@@ -1,8 +1,10 @@
/*
* vlc.h
- * Copyright (C) 1999-2001 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
+ * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org>
+ * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
*
* This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
+ * See http://libmpeg2.sourceforge.net/ for updates.
*
* mpeg2dec is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -27,9 +29,10 @@ do { \
static inline void bitstream_init (picture_t * picture, uint8_t * start)
{
- picture->bitstream_buf = 0; GETWORD (picture->bitstream_buf, 16, start);
- picture->bitstream_ptr = start;
- picture->bitstream_bits = 0;
+ picture->bitstream_buf =
+ (start[0] << 24) | (start[1] << 16) | (start[2] << 8) | start[3];
+ picture->bitstream_ptr = start + 4;
+ picture->bitstream_bits = -16;
}
/* make sure that there are at least 16 valid bits in bit_buf */