--- libmpeg3-1.6-orig/video/output.c	2005-08-08 20:57:01.000000000 -0600
+++ libmpeg3-1.6-orig/video/output.c	2005-10-16 23:23:24.000000000 -0600
@@ -104,7 +104,7 @@ 
 	*data++ = 0;
 
 #define STORE_PIXEL_RGB565 \
-	*((unsigned short*)data) = \
+	*data++ = \
 		((CLIP(r_l) & 0xf8) << 8) | \
 		((CLIP(g_l) & 0xfc) << 3) | \
 		((CLIP(b_l) & 0xf8) >> 3); \
--- libmpeg3-1.6-orig/Makefile	2005-08-27 21:21:13.000000000 -0600
+++ libmpeg3-1.6-orig/Makefile	2005-10-16 22:47:15.000000000 -0600
@@ -126,8 +126,28 @@ 
 #	$(OBJDIR)/audio/pcm.o \
 #	$(OBJDIR)/audio/tables.o \
 
-
-
+INSTALL_HEADERS = \
+	bitstream.h \
+	libmpeg3.h \
+	mpeg3atrack.h \
+	mpeg3css.h \
+	mpeg3demux.h \
+	mpeg3io.h \
+	mpeg3private.h \
+	mpeg3private.inc \
+	mpeg3protos.h \
+	mpeg3title.h \
+	mpeg3vtrack.h \
+	timecode.h 
+
+INSTALL_AHEADERS = \
+	audio/ac3.h \
+	audio/mpeg3audio.h 
+
+INSTALL_VHEADERS = \
+	video/idct.h \
+	video/slice.h \
+	video/mpeg3video.h
 
 DIRS := \
 	$(OBJDIR)/audio \
@@ -188,9 +208,20 @@ 
 		-ldl
 
 install: 
-	cp $(UTILS) $(PREFIX)/bin
+#	cp $(UTILS) $(PREFIX)/bin
 #	cp $(OUTPUT) $(PREFIX)/lib
 #	cp libmpeg3.h mpeg3private.h $(PREFIX)/include
+	install -d $(DESTDIR)/bin
+	install -d $(DESTDIR)/include/libmpeg3
+	install -d $(DESTDIR)/include/libmpeg3/audio
+	install -d $(DESTDIR)/include/libmpeg3/video
+	install -d $(DESTDIR)/lib
+	install $(UTILS) $(DESTDIR)/bin
+	install -m 644 $(INSTALL_HEADERS) $(DESTDIR)/include/libmpeg3
+	install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)/include/libmpeg3/audio
+	install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/include/libmpeg3/video
+	install -m 644 $(OUTPUT) $(DESTDIR)/lib
+	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/lib
 
 clean:
 	rm -rf $(OBJDIR)
--- libmpeg3-1.6-orig/Makefile	2005-10-16 22:49:00.000000000 -0600
+++ libmpeg3-1.6-orig/Makefile	2005-10-16 22:59:26.000000000 -0600
@@ -159,10 +159,9 @@ 
 
 
 OUTPUT = $(OBJDIR)/libmpeg3.a
-UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3peek $(OBJDIR)/mpeg3toc  $(OBJDIR)/mpeg3cat
-
-#$(OBJDIR)/mpeg3split
 
+SHAREDOUTPUT = $(OBJDIR)/libmpeg3.so
+UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3toc  $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3split
 
 LIBS = -lm -lpthread
 
@@ -173,13 +172,15 @@ 
 $(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
 $(shell mkdir -p $(DIRS) )
 
-all: $(OUTPUT) $(UTILS)
+all: $(OUTPUT) $(SHAREDOUTPUT) $(UTILS)
 
 
 $(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
 
 
+$(SHAREDOUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
+	gcc -shared -o $(SHAREDOUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS) $(LIBS)
 
 $(OBJDIR)/mpeg3dump: $(OUTPUT) mpeg3dump.c
 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS)
@@ -193,8 +194,8 @@ 
 $(OBJDIR)/mpeg3cat: $(OUTPUT) mpeg3cat.c
 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS)
 
-#$(OBJDIR)/mpeg3split: $(OUTPUT)
-#	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)
+$(OBJDIR)/mpeg3split: $(OUTPUT)
+	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)
 
 $(OBJDIR)/mpeg2qt: $(OUTPUT)
 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg2qt mpeg2qt.c \
@@ -250,6 +251,7 @@ 
 $(OBJDIR)/mpeg3dump.o: 				    mpeg3dump.c
 $(OBJDIR)/mpeg3ifo.o: 				    mpeg3ifo.c
 $(OBJDIR)/mpeg3io.o: 				    mpeg3io.c
+$(OBJDIR)/mpeg3split.o: 			    mpeg3split.c
 $(OBJDIR)/mpeg3title.o: 			    mpeg3title.c
 $(OBJDIR)/mpeg3toc3.o:  			    mpeg3toc3.c
 $(OBJDIR)/mpeg3toc.o: 				    mpeg3toc.c
--- libmpeg3-1.6-orig/mpeg3split.c	2005-04-27 00:52:15.000000000 -0600
+++ libmpeg3-1.6-orig/mpeg3split.c	2005-10-16 22:57:50.000000000 -0600
@@ -2,6 +2,7 @@ 
 #include <stdlib.h>
 #include <string.h>
 
+#include "mpeg3private.h"
 #include "mpeg3private.inc"
 
 void copy_data(FILE *out, FILE *in, long bytes)
@@ -3,7 +3,7 @@ 
 
 #include <stdint.h>
 #include <stdio.h>
-
+#include <pthread.h>
 
 
 
@@ -33,7 +33,7 @@ 
 
 
 ifeq ($(USE_CSS), 1)
-  CFLAGS += -DHAVE_CSS
+  CFLAGS += -DHAVE_CSS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 endif
 
 ifeq ($(USE_MMX), 1)
--- libmpeg3-1.5.2.orig/Makefile	2004-10-08 02:31:11.839597000 -0700
+++ libmpeg3-1.5.2.orig/Makefile	2004-10-08 02:33:42.627740299 -0700
@@ -212,13 +212,13 @@ 
 	install -d $(DESTDIR)/include/libmpeg3
 	install -d $(DESTDIR)/include/libmpeg3/audio
 	install -d $(DESTDIR)/include/libmpeg3/video
-	install -d $(DESTDIR)/lib
+	install -d $(DESTDIR)/$(LIBDIR)
 	install $(UTILS) $(DESTDIR)/bin
 	install -m 644 $(INSTALL_HEADERS) $(DESTDIR)/include/libmpeg3
 	install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)/include/libmpeg3/audio
 	install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/include/libmpeg3/video
-	install -m 644 $(OUTPUT) $(DESTDIR)/lib
-	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/lib
+	install -m 644 $(OUTPUT) $(DESTDIR)/$(LIBDIR)
+	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/$(LIBDIR)
 
 clean:
 	rm -rf $(OBJDIR)
--- libmpeg3.orig/bitstream.h	Fri Dec 21 14:00:01 2001
+++ libmpeg3.orig/bitstream.h	Mon Apr 15 14:13:12 2002
@@ -1,7 +1,7 @@ 
 #ifndef BITSTREAM_H
 #define BITSTREAM_H
 
-#include "mpeg3demux.h"
+#include <libmpeg3/mpeg3demux.h>
 #include <sys/types.h>
 
 //                                    next bit in forward direction
--- libmpeg3.orig/libmpeg3.h	Fri Dec 21 10:48:14 2001
+++ libmpeg3.orig/libmpeg3.h	Mon Apr 15 14:13:12 2002
@@ -5,7 +5,7 @@ 
 extern "C" {
 #endif
 
-#include "mpeg3private.h"
+#include <libmpeg3/mpeg3private.h>
 
 
 /* Supported color models for mpeg3_read_frame */
--- libmpeg3.orig/mpeg3css.h	Sun Sep 30 20:18:31 2001
+++ libmpeg3.orig/mpeg3css.h	Mon Apr 15 14:13:12 2002
@@ -2,7 +2,7 @@ 
 #define MPEG3CSS_H
 
 
-#include "mpeg3private.inc"
+#include <libmpeg3/mpeg3private.inc>
 
 struct mpeg3_block 
 {
--- libmpeg3.orig/mpeg3demux.h	Fri Dec 21 14:02:21 2001
+++ libmpeg3.orig/mpeg3demux.h	Mon Apr 15 14:13:12 2002
@@ -1,7 +1,7 @@ 
 #ifndef MPEG3DEMUX_H
 #define MPEG3DEMUX_H
 
-#include "mpeg3title.h"
+#include <libmpeg3/mpeg3title.h>
 #include <stdio.h>
 
 typedef struct
--- libmpeg3.orig/mpeg3io.h	Mon Dec 17 06:05:07 2001
+++ libmpeg3.orig/mpeg3io.h	Mon Apr 15 14:13:12 2002
@@ -4,8 +4,8 @@ 
 
 #include <stdio.h>
 #include <stdint.h>
-#include "mpeg3css.h"
-#include "mpeg3private.inc"
+#include <libmpeg3/mpeg3css.h>
+#include <libmpeg3/mpeg3private.inc>
 
 /* Filesystem structure */
 /* We buffer in MPEG3_IO_SIZE buffers.  Stream IO would require back */
--- libmpeg3.orig/mpeg3title.h	Wed Dec 19 06:28:25 2001
+++ libmpeg3.orig/mpeg3title.h	Mon Apr 15 14:13:12 2002
@@ -1,7 +1,7 @@ 
 #ifndef MPEG3TITLE_H
 #define MPEG3TITLE_H
 
-#include "mpeg3io.h"
+#include <libmpeg3/mpeg3io.h>
 
 // May get rid of time values and rename to a cell offset table.
 // May also get rid of end byte.
--- libmpeg3.orig/mpeg3vtrack.h	Thu Dec 20 08:19:18 2001
+++ libmpeg3.orig/mpeg3vtrack.h	Mon Apr 15 14:13:12 2002
@@ -1,8 +1,8 @@ 
 #ifndef MPEG3_VTRACK_H
 #define MPEG3_VTRACK_H
 
-#include "mpeg3demux.h"
-#include "video/mpeg3video.h"
+#include <libmpeg3/mpeg3demux.h>
+#include <libmpeg3/video/mpeg3video.h>
 
 typedef struct
 {
--- libmpeg3.orig/video/mpeg3video.h	Sun Sep 30 20:18:31 2001
+++ libmpeg3.orig/video/mpeg3video.h	Mon Apr 15 14:13:12 2002
@@ -1,9 +1,9 @@ 
 #ifndef MPEGVIDEO_H
 #define MPEGVIDEO_H
 
-#include "../bitstream.h"
-#include "../mpeg3private.inc"
-#include "idct.h"
-#include "slice.h"
-#include "../timecode.h"
+#include <libmpeg3/bitstream.h>
+#include <libmpeg3/mpeg3private.inc>
+#include <libmpeg3/video/idct.h>
+#include <libmpeg3/video/slice.h>
+#include <libmpeg3/timecode.h>
 #endif
--- libmpeg3.orig/mpeg3atrack.h	2003-07-26 17:31:58.000000000 -0400
+++ libmpeg3.orig/mpeg3atrack.h	2003-07-26 17:32:27.000000000 -0400
@@ -1,7 +1,7 @@ 
 #ifndef MPEG3ATRACK_H
 #define MPEG3ATRACK_H
 
-#include "mpeg3demux.h"
-#include "audio/mpeg3audio.h"
+#include <libmpeg3/mpeg3demux.h>
+#include <libmpeg3/audio/mpeg3audio.h>
 
 #endif