|
Lines 44-52
Link Here
|
| 44 |
|
44 |
|
| 45 |
#ffmpeg doesn'g use libtool, so the condition for PIC code |
45 |
#ffmpeg doesn'g use libtool, so the condition for PIC code |
| 46 |
#is __PIC__, not PIC. |
46 |
#is __PIC__, not PIC. |
| 47 |
sed -i -e 's/#if\(\(.*def *\)\|\(.*defined *\)\)PIC/#if\1__PIC__/' \ |
47 |
sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \ |
| 48 |
libavcodec/i386/dsputil_mmx{.c,_rnd.h} \ |
48 |
libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \ |
| 49 |
libavcodec/msmpeg4.c \ |
49 |
libavcodec/msmpeg4.c \ |
|
|
50 |
libavcodec/common.h \ |
| 50 |
|| die "sed failed (__PIC__)" |
51 |
|| die "sed failed (__PIC__)" |
| 51 |
|
52 |
|
| 52 |
#fixup liba52 to respect the --disable-mmx configure option |
53 |
#fixup liba52 to respect the --disable-mmx configure option |
|
Lines 72-81
Link Here
|
| 72 |
|
73 |
|
| 73 |
#disable mmx accelerated code if not requirested, or if PIC is required |
74 |
#disable mmx accelerated code if not requirested, or if PIC is required |
| 74 |
# as the provided asm decidedly isn't PIC. |
75 |
# as the provided asm decidedly isn't PIC. |
| 75 |
if has_pic || use !mmx; then |
76 |
if ( !has_pic && use mmx ) || use amd64 ; then |
| 76 |
myconf="${myconf} --disable-mmx" |
|
|
| 77 |
else |
| 78 |
myconf="${myconf} --enable-mmx" |
77 |
myconf="${myconf} --enable-mmx" |
|
|
78 |
else |
| 79 |
myconf="${myconf} --disable-mmx" |
| 79 |
fi |
80 |
fi |
| 80 |
|
81 |
|
| 81 |
use encode && use aac && myconf="${myconf} --enable-faac" |
82 |
use encode && use aac && myconf="${myconf} --enable-faac" |
