* First libdvdcss version

INSTALL.libdvdcss

+INSTALL file for libdvdcss, a DVD access library
+
+
+Configuring libdvdcss
+=====================
+
+A typical way to configure libdvdcss is:
+
+   ./configure --prefix=/usr
+
+See `./configure --help' for more information.
+
+It is also possible to cross-compile for the Win32 platform using mingw32:
+
+   make distclean && CC=i586-mingw32msvc-gcc CFLAGS=-I/usr/i586-mingw32msvc \
+     RANLIB=i586-mingw32msvc-ranlib ./configure --host=i386-mingw32msvc \
+     --target=i386-mingw32msvc --build=i386-linux
+
+
+Building libdvdcss
+==================
+
+Once configured, run `make' to build libdvdcss.
+
+
+Installing libdvdcss
+====================
+
+You can install libdvdcss by typing:
+
+   make install
+
+

Makefile

@@ -160,7 +160,7 @@ show:
 
 
 # ugliest of all, but I have no time to do it -- sam
-snapshot: Makefile.opts
+snapshot: clean Makefile.opts
 	rm -Rf /tmp/vlc-${PROGRAM_VERSION}* /tmp/vlc-${PROGRAM_VERSION}nocss*
 	# copy archive in /tmp
 	find -type d | grep -v CVS | grep -v '\.dep' | while read i ; \
@@ -183,7 +183,8 @@ snapshot: Makefile.opts
 			do rm -Rf $$i ; \
 		done
 	# copy misc files
-	cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO todo.pl \
+	cp vlc.spec AUTHORS COPYING ChangeLog INSTALL INSTALL.libdvdcss \
+		README TODO todo.pl \
 		Makefile.opts.in Makefile.dep Makefile.modules \
 		configure configure.in install-sh config.sub config.guess \
 			/tmp/vlc-${PROGRAM_VERSION}/
@@ -198,9 +199,6 @@ snapshot: Makefile.opts
 		cp share/$$icon.xpm share/$$icon.png \
 			/tmp/vlc-${PROGRAM_VERSION}/share/ ; done
 
-	# make distclean
-	(cd /tmp/vlc-${PROGRAM_VERSION} ; ./configure ; make distclean )
-
 	# build css-enabled archives
 	(cd /tmp ; tar cf vlc-${PROGRAM_VERSION}.tar vlc-${PROGRAM_VERSION} ; \
 		bzip2 -f -9 < vlc-${PROGRAM_VERSION}.tar \
@@ -212,6 +210,50 @@ snapshot: Makefile.opts
 	# clean up
 	rm -Rf /tmp/vlc-${PROGRAM_VERSION}*
 
+libdvdcss-snapshot: clean Makefile.opts
+	rm -Rf /tmp/libdvdcss-${LIBDVDCSS_VERSION}* \
+		/tmp/libdvdcss-${LIBDVDCSS_VERSION}nocss*
+	# copy archive in /tmp
+	find include extras doc lib -type d | grep -v CVS | grep -v '\.dep' | \
+		while read i ; do \
+			mkdir -p /tmp/libdvdcss-${LIBDVDCSS_VERSION}/$$i ; \
+		done
+	# .c .h .in .cpp .glade
+	find include extras -type f -name '*.[chig]*' | while read i ; \
+		do cp $$i /tmp/libdvdcss-${LIBDVDCSS_VERSION}/$$i ; done
+	# Makefiles
+	sed -e 's#^install:#install-unused:#' \
+		-e 's#^clean:#clean-unused:#' \
+		-e 's#^all:.*#all: libdvdcss#' \
+		-e 's#^libdvdcss-install:#install:#' \
+		-e 's#^libdvdcss-clean:#clean:#' \
+		< Makefile > /tmp/libdvdcss-${LIBDVDCSS_VERSION}/Makefile
+	# extra files
+	cp -a extras/* /tmp/libdvdcss-${LIBDVDCSS_VERSION}/extras
+	cp -a doc/* /tmp/libdvdcss-${LIBDVDCSS_VERSION}/doc
+	find /tmp/libdvdcss-${LIBDVDCSS_VERSION}/extras \
+		/tmp/libdvdcss-${LIBDVDCSS_VERSION}/doc \
+		-type d -name CVS | while read i ; \
+			do rm -Rf $$i ; \
+		done
+	# copy misc files
+	cp AUTHORS COPYING ChangeLog INSTALL INSTALL.libdvdcss README \
+		TODO todo.pl Makefile.opts.in Makefile.dep Makefile.modules \
+		configure configure.in install-sh config.sub config.guess \
+			/tmp/libdvdcss-${LIBDVDCSS_VERSION}/
+
+	# build css-enabled archives
+	(cd /tmp ; tar cf libdvdcss-${LIBDVDCSS_VERSION}.tar \
+		libdvdcss-${LIBDVDCSS_VERSION} ; \
+		bzip2 -f -9 < libdvdcss-${LIBDVDCSS_VERSION}.tar \
+			> libdvdcss-${LIBDVDCSS_VERSION}.tar.bz2 ; \
+		gzip -f -9 libdvdcss-${LIBDVDCSS_VERSION}.tar )
+	mv /tmp/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz \
+		/tmp/libdvdcss-${LIBDVDCSS_VERSION}.tar.bz2 ..
+
+	# clean up
+	rm -Rf /tmp/libdvdcss-${LIBDVDCSS_VERSION}*
+
 .PHONY: vlc.app
 vlc.app:
 ifneq (,$(findstring darwin,$(SYS)))

Makefile.opts.in

@@ -129,6 +129,7 @@ endif
 
 # PROGRAM_VERSION is the current vlc version
 PROGRAM_VERSION=@VLC_VERSION@
+LIBDVDCSS_VERSION=@LIBDVDCSS_VERSION@
 
 # DEFINE will contain some of the constants definitions decided in Makefile, 
 # including SYS_xx. It will be passed to C compiler.

configure.in

 dnl Autoconf settings for vlc
-AC_INIT(src/interface/main.c)
+AC_INIT(include/main.h)
 AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
 VLC_VERSION=0.2.80
 AC_SUBST(VLC_VERSION)
+LIBDVDCSS_VERSION=0.0.1
+AC_SUBST(LIBDVDCSS_VERSION)
 VLC_CODENAME=Ourumov
 AC_SUBST(VLC_CODENAME)
 

src/video_parser/vpar_blocks.c

@@ -2,7 +2,7 @@
  * vpar_blocks.c : blocks parsing
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vpar_blocks.c,v 1.81 2001/05/06 04:32:03 sam Exp $
+ * $Id: vpar_blocks.c,v 1.82 2001/06/18 23:42:07 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>
@@ -1580,6 +1580,7 @@ static __inline__ void InitMacroblock( vpar_thread_t * p_vpar,
         p_mb->p_backward = p_vpar->sequence.p_backward;
     else
         p_mb->p_backward = NULL;
+
     if( (i_coding_type == P_CODING_TYPE) || (i_coding_type == B_CODING_TYPE) )
         p_mb->p_forward = p_vpar->sequence.p_forward;
     else