Attachment #34399 for bug #51853

Lines 7-13 Link Here

(-)MPlayer-1.0pre4-orig/libavcodec/Makefile (-1 / +1 lines)
7	VPATH=$(SRC_PATH)/libavcodec	7	VPATH=$(SRC_PATH)/libavcodec
8		8
9	# NOTE: -I.. is needed to include config.h	9	# NOTE: -I.. is needed to include config.h
10	CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE	10	CFLAGS=$(OPTFLAGS) -fPIC -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
11		11
12	OBJS= common.o utils.o mem.o allcodecs.o \	12	OBJS= common.o utils.o mem.o allcodecs.o \
13	mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\	13	mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\

Lines 56-62 Link Here

(-)MPlayer-1.0pre4-orig/libavcodec/i386/dsputil_mmx.c (-1 / +1 lines)
56	"pcmpeqd %%" #regd ", %%" #regd " \n\t"\	56	"pcmpeqd %%" #regd ", %%" #regd " \n\t"\
57	"paddb %%" #regd ", %%" #regd " \n\t" ::)	57	"paddb %%" #regd ", %%" #regd " \n\t" ::)
58		58
59	#ifndef PIC	59	#ifndef __PIC__
60	#define MOVQ_BONE(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_bone))	60	#define MOVQ_BONE(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_bone))
61	#define MOVQ_WTWO(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_wtwo))	61	#define MOVQ_WTWO(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_wtwo))
62	#else	62	#else

Lines 96-102 Link Here

(-)MPlayer-1.0pre4-orig/libavcodec/i386/dsputil_mmx_rnd.h (-2 / +2 lines)
96	"addl %5, %3 \n\t"	96	"addl %5, %3 \n\t"
97	"subl $4, %0 \n\t"	97	"subl $4, %0 \n\t"
98	"jnz 1b \n\t"	98	"jnz 1b \n\t"
99	#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used	99	#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
100	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)	100	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
101	#else	101	#else
102	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)	102	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
Lines 191-197 Link Here
191	"addl $32, %2 \n\t"	191	"addl $32, %2 \n\t"
192	"subl $2, %0 \n\t"	192	"subl $2, %0 \n\t"
193	"jnz 1b \n\t"	193	"jnz 1b \n\t"
194	#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used	194	#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
195	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)	195	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
196	#else	196	#else
197	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)	197	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)

Lines 731-737 Link Here

(-)MPlayer-1.0pre4-orig/libavcodec/msmpeg4.c (-1 / +1 lines)
731	necessitate to modify mpegvideo.c. The problem comes from the	731	necessitate to modify mpegvideo.c. The problem comes from the
732	fact they decided to store the quantized DC (which would lead	732	fact they decided to store the quantized DC (which would lead
733	to problems if Q could vary !) */	733	to problems if Q could vary !) */
734	#if defined ARCH_X86 && !defined PIC	734	#if defined ARCH_X86 && !defined __PIC__
735	asm volatile(	735	asm volatile(
736	"movl %3, %%eax \n\t"	736	"movl %3, %%eax \n\t"
737	"shrl $1, %%eax \n\t"	737	"shrl $1, %%eax \n\t"

Lines 227-233 Link Here

(-)MPlayer-1.0pre4-orig/libmpdemux/aviheader.c (+3 lines)
227	avisuperindex_chunk *s;	227	avisuperindex_chunk *s;
228	// FIXME: do not use odml index for files that don't need it.	228	// FIXME: do not use odml index for files that don't need it.
229	// apparently the odml code is buggy!	229	// apparently the odml code is buggy!
		230
		231	/* re-enabling for files less then 2gb, see bug #52474
230	if (demuxer->movi_end < 0x7fffffff) break;	232	if (demuxer->movi_end < 0x7fffffff) break;
		233	*/
231	priv->suidx_size++;	234	priv->suidx_size++;
232	priv->suidx = realloc(priv->suidx, priv->suidx_size * sizeof (avisuperindex_chunk));	235	priv->suidx = realloc(priv->suidx, priv->suidx_size * sizeof (avisuperindex_chunk));
233	s = &priv->suidx[priv->suidx_size-1];	236	s = &priv->suidx[priv->suidx_size-1];

Lines 35-41 Link Here

(-)MPlayer-1.0pre4-orig/libmpeg2/cpu_accel.c (-1 / +1 lines)
35	int AMD;	35	int AMD;
36	uint32_t caps;	36	uint32_t caps;
37		37
38	#ifndef PIC	38	#ifndef __PIC__
39	#define cpuid(op,eax,ebx,ecx,edx) \	39	#define cpuid(op,eax,ebx,ecx,edx) \
40	__asm__ ("cpuid" \	40	__asm__ ("cpuid" \
41	: "=a" (eax), \	41	: "=a" (eax), \

Return to bug 51853