Attachment #70828 for bug #45325

Lines 104-110 Link Here

(-)libmpeg3-1.6-orig/video/output.c (-1 / +1 lines)
104	*data++ = 0;	104	*data++ = 0;
105		105
106	#define STORE_PIXEL_RGB565 \	106	#define STORE_PIXEL_RGB565 \
107	((unsigned short)data) = \	107	*data++ = \
108	((CLIP(r_l) & 0xf8) << 8) \| \	108	((CLIP(r_l) & 0xf8) << 8) \| \
109	((CLIP(g_l) & 0xfc) << 3) \| \	109	((CLIP(g_l) & 0xfc) << 3) \| \
110	((CLIP(b_l) & 0xf8) >> 3); \	110	((CLIP(b_l) & 0xf8) >> 3); \




#	$(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 \

		-ldl

install: 
#	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)

Lines 159-168 Link Here

(-)libmpeg3-1.6-orig/Makefile (-6 / +8 lines)
159		159
160		160
161	OUTPUT = $(OBJDIR)/libmpeg3.a	161	OUTPUT = $(OBJDIR)/libmpeg3.a
162	UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3peek $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3cat
163
164	#$(OBJDIR)/mpeg3split
165		162
		163	SHAREDOUTPUT = $(OBJDIR)/libmpeg3.so
		164	UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3split
166		165
167	LIBS = -lm -lpthread	166	LIBS = -lm -lpthread
168		167
Lines 173-185 Link Here
173	$(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)	172	$(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
174	$(shell mkdir -p $(DIRS) )	173	$(shell mkdir -p $(DIRS) )
175		174
176	all: $(OUTPUT) $(UTILS)	175	all: $(OUTPUT) $(SHAREDOUTPUT) $(UTILS)
177		176
178		177
179	$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)	178	$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
180	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`	179	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
181		180
182		181
		182	$(SHAREDOUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
		183	gcc -shared -o $(SHAREDOUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS) $(LIBS)
183		184
184	$(OBJDIR)/mpeg3dump: $(OUTPUT) mpeg3dump.c	185	$(OBJDIR)/mpeg3dump: $(OUTPUT) mpeg3dump.c
185	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS)	186	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS)
Lines 193-200 Link Here
193	$(OBJDIR)/mpeg3cat: $(OUTPUT) mpeg3cat.c	194	$(OBJDIR)/mpeg3cat: $(OUTPUT) mpeg3cat.c
194	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS)	195	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS)
195		196
196	#$(OBJDIR)/mpeg3split: $(OUTPUT)	197	$(OBJDIR)/mpeg3split: $(OUTPUT)
197	# $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)	198	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)
198		199
199	$(OBJDIR)/mpeg2qt: $(OUTPUT)	200	$(OBJDIR)/mpeg2qt: $(OUTPUT)
200	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg2qt mpeg2qt.c \	201	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg2qt mpeg2qt.c \
Lines 250-255 Link Here
250	$(OBJDIR)/mpeg3dump.o: mpeg3dump.c	251	$(OBJDIR)/mpeg3dump.o: mpeg3dump.c
251	$(OBJDIR)/mpeg3ifo.o: mpeg3ifo.c	252	$(OBJDIR)/mpeg3ifo.o: mpeg3ifo.c
252	$(OBJDIR)/mpeg3io.o: mpeg3io.c	253	$(OBJDIR)/mpeg3io.o: mpeg3io.c
		254	$(OBJDIR)/mpeg3split.o: mpeg3split.c
253	$(OBJDIR)/mpeg3title.o: mpeg3title.c	255	$(OBJDIR)/mpeg3title.o: mpeg3title.c
254	$(OBJDIR)/mpeg3toc3.o: mpeg3toc3.c	256	$(OBJDIR)/mpeg3toc3.o: mpeg3toc3.c
255	$(OBJDIR)/mpeg3toc.o: mpeg3toc.c	257	$(OBJDIR)/mpeg3toc.o: mpeg3toc.c




#include <stdlib.h>
#include <string.h>

#include "mpeg3private.h"
#include "mpeg3private.inc"

void copy_data(FILE *out, FILE *in, long bytes)


#include <stdint.h>
#include <stdio.h>
#include <pthread.h>






ifeq ($(USE_CSS), 1)
  CFLAGS += -DHAVE_CSS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
endif

ifeq ($(USE_MMX), 1)




	install -d $(DESTDIR)/include/libmpeg3
	install -d $(DESTDIR)/include/libmpeg3/audio
	install -d $(DESTDIR)/include/libmpeg3/video
	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)/$(LIBDIR)
	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/$(LIBDIR)

clean:
	rm -rf $(OBJDIR)

Lines 1-7 Link Here

(-)libmpeg3.orig/bitstream.h (-1 / +1 lines)
1	#ifndef BITSTREAM_H	1	#ifndef BITSTREAM_H
2	#define BITSTREAM_H	2	#define BITSTREAM_H
3		3
4	#include "mpeg3demux.h"	4	#include <libmpeg3/mpeg3demux.h>
5	#include <sys/types.h>	5	#include <sys/types.h>
6		6
7	// next bit in forward direction	7	// next bit in forward direction

Lines 5-11 Link Here

(-)libmpeg3.orig/libmpeg3.h (-1 / +1 lines)
5	extern "C" {	5	extern "C" {
6	#endif	6	#endif
7		7
8	#include "mpeg3private.h"	8	#include <libmpeg3/mpeg3private.h>
9		9
10		10
11	/* Supported color models for mpeg3_read_frame */	11	/* Supported color models for mpeg3_read_frame */

Lines 2-8 Link Here

(-)libmpeg3.orig/mpeg3css.h (-1 / +1 lines)
2	#define MPEG3CSS_H	2	#define MPEG3CSS_H
3		3
4		4
5	#include "mpeg3private.inc"	5	#include <libmpeg3/mpeg3private.inc>
6		6
7	struct mpeg3_block	7	struct mpeg3_block
8	{	8	{

Lines 1-7 Link Here

(-)libmpeg3.orig/mpeg3demux.h (-1 / +1 lines)
1	#ifndef MPEG3DEMUX_H	1	#ifndef MPEG3DEMUX_H
2	#define MPEG3DEMUX_H	2	#define MPEG3DEMUX_H
3		3
4	#include "mpeg3title.h"	4	#include <libmpeg3/mpeg3title.h>
5	#include <stdio.h>	5	#include <stdio.h>
6		6
7	typedef struct	7	typedef struct

Lines 4-11 Link Here

(-)libmpeg3.orig/mpeg3io.h (-2 / +2 lines)
4		4
5	#include <stdio.h>	5	#include <stdio.h>
6	#include <stdint.h>	6	#include <stdint.h>
7	#include "mpeg3css.h"	7	#include <libmpeg3/mpeg3css.h>
8	#include "mpeg3private.inc"	8	#include <libmpeg3/mpeg3private.inc>
9		9
10	/* Filesystem structure */	10	/* Filesystem structure */
11	/* We buffer in MPEG3_IO_SIZE buffers. Stream IO would require back */	11	/* We buffer in MPEG3_IO_SIZE buffers. Stream IO would require back */

Lines 1-7 Link Here

(-)libmpeg3.orig/mpeg3title.h (-1 / +1 lines)
1	#ifndef MPEG3TITLE_H	1	#ifndef MPEG3TITLE_H
2	#define MPEG3TITLE_H	2	#define MPEG3TITLE_H
3		3
4	#include "mpeg3io.h"	4	#include <libmpeg3/mpeg3io.h>
5		5
6	// May get rid of time values and rename to a cell offset table.	6	// May get rid of time values and rename to a cell offset table.
7	// May also get rid of end byte.	7	// May also get rid of end byte.

Lines 1-8 Link Here

(-)libmpeg3.orig/mpeg3vtrack.h (-2 / +2 lines)
1	#ifndef MPEG3_VTRACK_H	1	#ifndef MPEG3_VTRACK_H
2	#define MPEG3_VTRACK_H	2	#define MPEG3_VTRACK_H
3		3
4	#include "mpeg3demux.h"	4	#include <libmpeg3/mpeg3demux.h>
5	#include "video/mpeg3video.h"	5	#include <libmpeg3/video/mpeg3video.h>
6		6
7	typedef struct	7	typedef struct
8	{	8	{

Lines 1-9 Link Here

(-)libmpeg3.orig/video/mpeg3video.h (-5 / +5 lines)
1	#ifndef MPEGVIDEO_H	1	#ifndef MPEGVIDEO_H
2	#define MPEGVIDEO_H	2	#define MPEGVIDEO_H
3		3
4	#include "../bitstream.h"	4	#include <libmpeg3/bitstream.h>
5	#include "../mpeg3private.inc"	5	#include <libmpeg3/mpeg3private.inc>
6	#include "idct.h"	6	#include <libmpeg3/video/idct.h>
7	#include "slice.h"	7	#include <libmpeg3/video/slice.h>
8	#include "../timecode.h"	8	#include <libmpeg3/timecode.h>
9	#endif	9	#endif

Lines 1-7 Link Here

(-)libmpeg3.orig/mpeg3atrack.h (-2 / +2 lines)
1	#ifndef MPEG3ATRACK_H	1	#ifndef MPEG3ATRACK_H
2	#define MPEG3ATRACK_H	2	#define MPEG3ATRACK_H
3		3
4	#include "mpeg3demux.h"	4	#include <libmpeg3/mpeg3demux.h>
5	#include "audio/mpeg3audio.h"	5	#include <libmpeg3/audio/mpeg3audio.h>
6		6
7	#endif	7	#endif

Return to bug 45325

Lines 126-133 Link Here

(-)libmpeg3-1.6-orig/Makefile (-3 / +34 lines)
126	# $(OBJDIR)/audio/pcm.o \	126	# $(OBJDIR)/audio/pcm.o \
127	# $(OBJDIR)/audio/tables.o \	127	# $(OBJDIR)/audio/tables.o \
128		128
129		129	INSTALL_HEADERS = \
130		130	bitstream.h \
		131	libmpeg3.h \
		132	mpeg3atrack.h \
		133	mpeg3css.h \
		134	mpeg3demux.h \
		135	mpeg3io.h \
		136	mpeg3private.h \
		137	mpeg3private.inc \
		138	mpeg3protos.h \
		139	mpeg3title.h \
		140	mpeg3vtrack.h \
		141	timecode.h
		142
		143	INSTALL_AHEADERS = \
		144	audio/ac3.h \
		145	audio/mpeg3audio.h
		146
		147	INSTALL_VHEADERS = \
		148	video/idct.h \
		149	video/slice.h \
		150	video/mpeg3video.h
131		151
132	DIRS := \	152	DIRS := \
133	$(OBJDIR)/audio \	153	$(OBJDIR)/audio \
Lines 188-196 Link Here
188	-ldl	208	-ldl
189		209
190	install:	210	install:
191	cp $(UTILS) $(PREFIX)/bin	211	# cp $(UTILS) $(PREFIX)/bin
192	# cp $(OUTPUT) $(PREFIX)/lib	212	# cp $(OUTPUT) $(PREFIX)/lib
193	# cp libmpeg3.h mpeg3private.h $(PREFIX)/include	213	# cp libmpeg3.h mpeg3private.h $(PREFIX)/include
		214	install -d $(DESTDIR)/bin
		215	install -d $(DESTDIR)/include/libmpeg3
		216	install -d $(DESTDIR)/include/libmpeg3/audio
		217	install -d $(DESTDIR)/include/libmpeg3/video
		218	install -d $(DESTDIR)/lib
		219	install $(UTILS) $(DESTDIR)/bin
		220	install -m 644 $(INSTALL_HEADERS) $(DESTDIR)/include/libmpeg3
		221	install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)/include/libmpeg3/audio
		222	install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/include/libmpeg3/video
		223	install -m 644 $(OUTPUT) $(DESTDIR)/lib
		224	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/lib
194		225
195	clean:	226	clean:
196	rm -rf $(OBJDIR)	227	rm -rf $(OBJDIR)

Lines 212-224 Link Here

(-)libmpeg3-1.5.2.orig/Makefile (-3 / +3 lines)
212	install -d $(DESTDIR)/include/libmpeg3	212	install -d $(DESTDIR)/include/libmpeg3
213	install -d $(DESTDIR)/include/libmpeg3/audio	213	install -d $(DESTDIR)/include/libmpeg3/audio
214	install -d $(DESTDIR)/include/libmpeg3/video	214	install -d $(DESTDIR)/include/libmpeg3/video
215	install -d $(DESTDIR)/lib	215	install -d $(DESTDIR)/$(LIBDIR)
216	install $(UTILS) $(DESTDIR)/bin	216	install $(UTILS) $(DESTDIR)/bin
217	install -m 644 $(INSTALL_HEADERS) $(DESTDIR)/include/libmpeg3	217	install -m 644 $(INSTALL_HEADERS) $(DESTDIR)/include/libmpeg3
218	install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)/include/libmpeg3/audio	218	install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)/include/libmpeg3/audio
219	install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/include/libmpeg3/video	219	install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/include/libmpeg3/video
220	install -m 644 $(OUTPUT) $(DESTDIR)/lib	220	install -m 644 $(OUTPUT) $(DESTDIR)/$(LIBDIR)
221	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/lib	221	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/$(LIBDIR)
222		222
223	clean:	223	clean:
224	rm -rf $(OBJDIR)	224	rm -rf $(OBJDIR)

Lines 2-7 Link Here

(-)libmpeg3-1.6-orig/mpeg3split.c (-2 / +3 lines)
2	#include <stdlib.h>	2	#include <stdlib.h>
3	#include <string.h>	3	#include <string.h>
4		4
		5	#include "mpeg3private.h"
5	#include "mpeg3private.inc"	6	#include "mpeg3private.inc"
6		7
7	void copy_data(FILE out, FILE in, long bytes)	8	void copy_data(FILE out, FILE in, long bytes)
Lines 3-9 Link Here
3		3
4	#include <stdint.h>	4	#include <stdint.h>
5	#include <stdio.h>	5	#include <stdio.h>
6		6	#include <pthread.h>
7		7
8		8
9		9
Lines 33-39 Link Here
33		33
34		34
35	ifeq ($(USE_CSS), 1)	35	ifeq ($(USE_CSS), 1)
36	CFLAGS += -DHAVE_CSS	36	CFLAGS += -DHAVE_CSS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
37	endif	37	endif
38		38
39	ifeq ($(USE_MMX), 1)	39	ifeq ($(USE_MMX), 1)