diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2004-12-07 08:11:58 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2004-12-07 08:11:58 +0000 |
| commit | 00ec4f0faaf8219412bce193ee754b0031f04660 (patch) | |
| tree | 4891c1caa0f8bc198efcd692ce2862f50879c516 /multimedia/vlc/files | |
| parent | 9ac0cfd576f61615675c2e75de09731e227ae396 (diff) | |
Notes
Diffstat (limited to 'multimedia/vlc/files')
| -rw-r--r-- | multimedia/vlc/files/ffmpeg-patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/multimedia/vlc/files/ffmpeg-patch b/multimedia/vlc/files/ffmpeg-patch deleted file mode 100644 index 2a4b7280ae5e..000000000000 --- a/multimedia/vlc/files/ffmpeg-patch +++ /dev/null @@ -1,56 +0,0 @@ ---- libavcodec/liba52/resample_mmx.c 2004/05/01 14:38:45 1.1 -+++ libavcodec/liba52/resample_mmx.c 2004/05/01 14:58:39 -@@ -7,10 +7,10 @@ - and it would mean (C / MMX2 / MMX / 3DNOW) versions - */ - --static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL; --static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL; --static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL; --static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL; - - static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){ - int32_t * f = (int32_t *) _f; - ---- Makefile.orig Fri Oct 22 04:08:47 2004 -+++ Makefile Fri Oct 22 04:12:43 2004 -@@ -81,28 +81,29 @@ - all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) - - lib: -- $(MAKE) -C libavcodec all -- $(MAKE) -C libavformat all -+ $(MAKE) LDFLAGS="$(LDFLAGS)" -C libavcodec all -+ $(MAKE) LDFLAGS="$(LDFLAGS)" -C libavformat all -+ - - ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs -- $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS) - - ffmpeg$(EXESUF): ffmpeg_g$(EXESUF) - cp -p $< $@ - $(STRIP) $@ - - ffserver$(EXESUF): ffserver.o .libs -- $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(EXTRALIBS) - - ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs -- $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) - - ffplay$(EXESUF): ffplay_g$(EXESUF) - cp -p $< $@ - $(STRIP) $@ - - output_example$(EXESUF): output_example.o .libs -- $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS) - - qt-faststart$(EXESUF): qt-faststart.c - $(CC) qt-faststart.c -o qt-faststart$(EXESUF) |