|
[-]
[+]
|
Changed |
MPlayer.spec
|
|
|
|
[-]
[+]
|
Deleted |
MPlayer-0.90pre9-tempfile-unrarlib.diff
^
|
| @@ -1,34 +0,0 @@
---- MPlayer-1.0rc1/unrarlib.c
-+++ MPlayer-1.0rc1/unrarlib.c
-@@ -2686,9 +2686,18 @@
- FILE *fp;
- char date[] = __DATE__;
- char time[] = __TIME__;
-+ char *homedir;
-
- debug_start_time = GetTickCount(); /* get start time */
-- strcpy(log_file_name, file_name); /* save file name */
-+/* strcpy(log_file_name, file_name); */ /* save file name */
-+ homedir=getenv("HOME");
-+ if(homedir)
-+ {
-+ snprintf(log_file_name, sizeof(log_file_name)-1, file_name, homedir );
-+ } else {
-+ sprintf(log_file_name, file_name, ".");
-+ }
-+ log_file_name[sizeof(log_file_name)-1]='\0';
-
- if((fp = fopen(log_file_name, CREATETEXT)) != NULL)
- {
---- MPlayer-1.0rc1/unrarlib.h
-+++ MPlayer-1.0rc1/unrarlib.h
-@@ -76,7 +76,8 @@
- #define _DEBUG_LOG_FILE "C:\\temp\\debug_unrar.txt" /* log file path */
- #else
- #define _UNIX /* Linux or Unix with GCC */
--#define _DEBUG_LOG_FILE "/tmp/debug_unrar.txt" /* log file path */
-+ /* CAUTION: Do not remove this format string here. It's needed. */
-+#define _DEBUG_LOG_FILE "%s/debug_unrar.txt" /* log file path */
- /*#define NON_INTEL_BYTE_ORDER*/ /* GCC on motorola systems */
-
- #endif
|
|
[-]
[+]
|
Deleted |
MPlayer-1.0pre7-gcc4-altivec.patch
^
|
| @@ -1,101 +0,0 @@
---- configure
-+++ configure
-@@ -1306,6 +1306,9 @@
- *) ;;
- esac
- fi
-+ if test -n "`$_cpuinfo | grep Power4`"; then
-+ _altivec=yes
-+ fi
- fi
-
- if test -n "$_mcpu"; then
---- liba52/resample_altivec.c
-+++ liba52/resample_altivec.c
-@@ -18,7 +18,7 @@
- }
-
- static int a52_resample_STEREO_to_2_altivec(float * _f, int16_t * s16){
--#if 0
-+ if ((intptr_t) _f & 15 || (intptr_t) s16 & 15) {
- int i;
- int32_t * f = (int32_t *) _f;
- for (i = 0; i < 256; i++) {
-@@ -26,7 +26,7 @@
- s16[2*i+1] = convert (f[i+256]);
- }
- return 2*256;
--#else
-+ } else {
- int i = 0;
- int32_t * f = (int32_t *) _f;
- register vector signed int f0, f4, f256, f260;
-@@ -52,7 +52,7 @@
- s16 += 16;
- }
- return(2*256);
--#endif
-+ }
- }
-
- static void* a52_resample_altivec(int flags, int ch){
---- libavcodec/ppc/fdct_altivec.c
-+++ libavcodec/ppc/fdct_altivec.c
-@@ -32,6 +32,11 @@
- #define vu16(v) ((vector unsigned short)(v))
- #define vu32(v) ((vector unsigned int)(v))
-
-+#define vs16l(v) (*(vector signed short *)&(v))
-+#define vs32l(v) (*(vector signed int *)&(v))
-+#define vu8l(v) (*(vector unsigned char *)&(v))
-+#define vu16l(v) (*(vector unsigned short *)&(v))
-+#define vu32l(v) (*(vector unsigned int *)&(v))
-
- #define C1 0.98078525066375732421875000 /* cos(1*PI/16) */
- #define C2 0.92387950420379638671875000 /* cos(2*PI/16) */
---- libswscale/yuv2rgb.c
-+++ libswscale/yuv2rgb.c
-@@ -37,6 +37,9 @@
-
- #include "config.h"
- #include "rgb2rgb.h"
-+#ifdef HAVE_ALTIVEC_H
-+#include <altivec.h>
-+#endif
- #include "swscale.h"
- #include "swscale_internal.h"
-
-@@ -652,7 +652,7 @@
- #ifdef HAVE_ALTIVEC
- if (c->flags & SWS_CPU_CAPS_ALTIVEC)
- {
-- SwsFunc t = yuv2rgb_init_altivec(c);
-+ extern SwsFunc yuv2rgb_init_altivec(SwsContext *);
- if (t) return t;
- }
- #endif
---- libswscale/yuv2rgb_altivec.c
-+++ libswscale/yuv2rgb_altivec.c
-@@ -90,6 +90,9 @@
- #include <malloc.h>
- #endif
- #include "rgb2rgb.h"
-+#ifdef HAVE_ALTIVEC_H
-+#include <altivec.h>
-+#endif
- #include "swscale.h"
- #include "swscale_internal.h"
-
---- libvo/vo_x11.c
-+++ libvo/vo_x11.c
-@@ -38,6 +38,10 @@
- #include "fastmemcpy.h"
- #include "sub.h"
-
-+#ifdef HAVE_ALTIVEC_H
-+#include <altivec.h>
-+#endif
-+
- #include "libswscale/swscale.h"
- #include "libmpcodecs/vf_scale.h"
- #define MODE_RGB 0x1
|
|
[-]
[+]
|
Deleted |
MPlayer-1.0rc1-desktopfile.patch
^
|
| @@ -1,11 +0,0 @@
---- etc/mplayer.desktop
-+++ etc/mplayer.desktop
-@@ -8,7 +8,7 @@
- Comment[es]=Reproductor multimedia
- Comment[fr]=Lecteur multimedia
- Comment[it]=Lettore multimediale
--Icon=mplayer.xpm
-+Icon=mplayer
- TryExec=gmplayer
- Exec=gmplayer
- Terminal=false
|
|
[-]
[+]
|
Added |
MPlayer-amd64-detection.patch
^
|
| @@ -0,0 +1,23 @@
+--- cpuinfo.c.orig 2008-09-14 12:38:08.000000000 +0200
++++ cpuinfo.c 2008-09-14 12:39:31.000000000 +0200
+@@ -48,18 +48,8 @@
+ cpuid(int func) {
+ cpuid_regs_t regs;
+ #define CPUID ".byte 0x0f, 0xa2; "
+-#ifdef __x86_64__
+- asm("mov %%rbx, %%rsi\n\t"
+-#else
+- asm("mov %%ebx, %%esi\n\t"
+-#endif
+- CPUID"\n\t"
+-#ifdef __x86_64__
+- "xchg %%rsi, %%rbx\n\t"
+-#else
+- "xchg %%esi, %%ebx\n\t"
+-#endif
+- : "=a" (regs.eax), "=S" (regs.ebx), "=c" (regs.ecx), "=d" (regs.edx)
++ asm(CPUID
++ : "=a" (regs.eax), "=b" (regs.ebx), "=c" (regs.ecx), "=d" (regs.edx)
+ : "0" (func));
+ return regs;
+ }
|
|
[-]
[+]
|
Changed |
MPlayer-pci_linux_gnu_source.patch
^
|
| @@ -1,22 +1,24 @@
---- vidix/pci.c
-+++ vidix/pci.c
-@@ -50,7 +50,8 @@
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Index: vidix/pci.c
+===================================================================
+--- vidix/pci.c (revision 27626)
++++ vidix/pci.c (working copy)
+@@ -51,6 +51,7 @@
*
*/
--
-+
-+#define _GNU_SOURCE
+
++#define _GNU_SOURCE
#include "dha.h"
#include <errno.h>
#include <string.h>
---- vidix/sysdep/pci_linux.c
-+++ vidix/sysdep/pci_linux.c
-@@ -3,6 +3,7 @@
- $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.34.2.17 1998/11/10 11:55:40 dawes Exp $
- Modified for readability by Nick Kurshev
- */
-+#define _GNU_SOURCE
+Index: vidix/sysdep/pci_linux.c
+===================================================================
+--- vidix/sysdep/pci_linux.c (revision 27626)
++++ vidix/sysdep/pci_linux.c (working copy)
+@@ -26,6 +26,7 @@
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#define _GNU_SOURCE
#include <errno.h>
#ifdef __i386__
//#include <sys/perm.h> doesn't exist on libc5 systems
|
|
[-]
[+]
|
Added |
MPlayer-svn_version.patch
^
|
| @@ -0,0 +1,23 @@
+Index: version.sh
+===================================================================
+--- version.sh (revision 27637)
++++ version.sh (working copy)
+@@ -2,14 +2,12 @@
+
+ test "$1" && extra="-$1"
+
+-svn_revision=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
+-test $svn_revision || svn_revision=`grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
+-test $svn_revision || svn_revision=`sed -n -e '/^dir$/{n;p;q;}' .svn/entries 2>/dev/null`
+-test $svn_revision || svn_revision=UNKNOWN
++svn_revision='@@SVN_REVISION@@'
++suse_version='@@SUSE_VERSION@@'
+
+-NEW_REVISION="#define VERSION \"dev-SVN-r${svn_revision}${extra}\""
++NEW_REVISION="#define VERSION \"dev-SVN-r${svn_revision}${extra}-${suse_version}\""
+ OLD_REVISION=`cat version.h 2> /dev/null`
+-TITLE="#define MP_TITLE \"MPlayer dev-SVN-r${svn_revision}${extra} (C) 2000-2008 MPlayer Team\""
++TITLE="#define MP_TITLE \"MPlayer dev-SVN-r${svn_revision}${extra}-${suse_version} (C) 2000-2008 MPlayer Team\""
+
+ # Update version.h only on revision changes to avoid spurious rebuilds
+ if test "$NEW_REVISION" != "$OLD_REVISION"; then
|
|
[-]
[+]
|
Added |
MPlayer-x26465.patch
^
|
| @@ -0,0 +1,25 @@
+--- libavcodec/libx264.c
++++ libavcodec/libx264.c
+@@ -162,7 +162,11 @@
+
+ x4->params.i_bframe = avctx->max_b_frames;
+ x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
++#if X264_BUILD > 62
+ x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
++#else
++ x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
++#endif
+ x4->params.i_bframe_bias = avctx->bframebias;
+ x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
+ avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
+@@ -227,8 +231,10 @@
+ x4->params.analyse.i_me_range = avctx->me_range;
+ x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
+
++#if X264_BUILD < 65
+ x4->params.analyse.b_bidir_me = avctx->bidir_refine > 0;
+ x4->params.analyse.b_bframe_rdo = avctx->flags2 & CODEC_FLAG2_BRDO;
++#endif
+ x4->params.analyse.b_mixed_references =
+ avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
+ x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
|
|
[-]
[+]
|
Deleted |
MPlayer_Movie_Protect.patch
^
|
| @@ -1,104 +0,0 @@
---- dvdread/dvd_input.c 2007-08-15 14:01:48.000000000 +0200
-+++ dvdread/dvd_input.c.new 2008-02-02 21:46:01.000000000 +0100
-@@ -376,6 +376,8 @@
- }
- #endif /* HAVE_DVDCSS_DVDCSS_H */
-
-+ fprintf(stderr, "libdvdread patched to play DVDs with DVD-Movie-Protect\n");
-+
- dvdcss_library_init = 1;
-
- if(dvdcss_library) {
---- dvdread/dvd_udf.c 2007-08-15 14:01:48.000000000 +0200
-+++ dvdread/dvd_udf.c.new 2008-02-02 21:53:04.000000000 +0100
-@@ -39,6 +39,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <fnmatch.h>
-
- #if defined(HAVE_INTTYPES_H)
- #include <inttypes.h>
-@@ -50,6 +51,9 @@
- #include "dvd_udf.h"
- #include "dvdread_internal.h"
-
-+#include "ifo_types.h"
-+#include "ifo_read.h"
-+
- #ifndef EMEDIUMTYPE
- #define EMEDIUMTYPE ENOENT
- #endif
-@@ -965,6 +969,71 @@
- uint32_t UDFFindFile( dvd_reader_t *device, char *filename,
- uint32_t *filesize )
- {
-+ uint32_t offset=0;
-+ if (!fnmatch("/VIDEO_TS/VTS_[0-9][0-9]_[0-9].???", filename, FNM_PATHNAME)) {
-+ size_t len = strlen(filename);
-+ char *extension = &filename[len-3];
-+ if (!strcmp(extension, "IFO") || !strcmp(extension, "VOB")) {
-+ int title = atoi(&filename[len-8]);
-+ int part = atoi(&filename[len-5]);
-+
-+ ifo_handle_t *ifo_handle = ifoOpen(device, 0);
-+ if (0 == ifo_handle)
-+ return 0;
-+
-+ if (title > ifo_handle->tt_srpt->nr_of_srpts) {
-+ ifoClose(ifo_handle);
-+ return 0;
-+
-+ }
-+
-+ uint32_t tmp_filesize;
-+ offset += UDFFindFile(device, "/VIDEO_TS/VIDEO_TS.IFO", &tmp_filesize);
-+
-+ int i;
-+ for (i=0; i<ifo_handle->tt_srpt->nr_of_srpts; i++)
-+ if (title == ifo_handle->tt_srpt->title[i].title_set_nr)
-+ break;
-+
-+ if (i == ifo_handle->tt_srpt->nr_of_srpts) {
-+ /* not found */
-+ ifoClose(ifo_handle);
-+ return 0;
-+ }
-+ offset += ifo_handle->tt_srpt->title[i].title_set_sector;
-+
-+ ifoClose(ifo_handle);
-+
-+ if (!strcmp(extension, "VOB")) {
-+ ifo_handle = ifoOpen(device, title);
-+ if (0 == ifo_handle)
-+ return 0;
-+
-+ switch(part) {
-+ case 0:
-+ if (0 == ifo_handle->vtsi_mat->vtsm_vobs)
-+ return 0;
-+ offset += ifo_handle->vtsi_mat->vtsm_vobs;
-+ break;
-+ case 1:
-+ if (0 == ifo_handle->vtsi_mat->vtstt_vobs)
-+ return 0;
-+ offset += ifo_handle->vtsi_mat->vtstt_vobs;
-+ break;
-+ default: /* can't get other parts (also no need to) */
-+ offset = 0;
-+ break;
-+ }
-+ ifoClose(ifo_handle);
-+ }
-+ }
-+
-+ *filesize = 1000000; /* File size unknown */
-+ if (offset != 0)
-+ return offset;
-+ }
-+
-+
- uint8_t *LogBlock;
- uint32_t lbnum;
- uint16_t TagID;
-
|
|
[-]
[+]
|
Deleted |
asm-fixes.diff
^
|
| @@ -1,280 +0,0 @@
---- libpostproc/postprocess.c
-+++ libpostproc/postprocess.c
-@@ -120,14 +120,14 @@
- #endif
-
- #if defined(ARCH_X86) || defined(ARCH_X86_64)
--static uint64_t __attribute__((aligned(8))) attribute_used w05= 0x0005000500050005LL;
--static uint64_t __attribute__((aligned(8))) attribute_used w04= 0x0004000400040004LL;
--static uint64_t __attribute__((aligned(8))) attribute_used w20= 0x0020002000200020LL;
--static uint64_t __attribute__((aligned(8))) attribute_used b00= 0x0000000000000000LL;
--static uint64_t __attribute__((aligned(8))) attribute_used b01= 0x0101010101010101LL;
--static uint64_t __attribute__((aligned(8))) attribute_used b02= 0x0202020202020202LL;
--static uint64_t __attribute__((aligned(8))) attribute_used b08= 0x0808080808080808LL;
--static uint64_t __attribute__((aligned(8))) attribute_used b80= 0x8080808080808080LL;
-+static uint64_t __attribute__((aligned(8),used)) attribute_used w05= 0x0005000500050005LL;
-+static uint64_t __attribute__((aligned(8),used)) attribute_used w04= 0x0004000400040004LL;
-+static uint64_t __attribute__((aligned(8),used)) attribute_used w20= 0x0020002000200020LL;
-+static uint64_t __attribute__((aligned(8),used)) attribute_used b00= 0x0000000000000000LL;
-+static uint64_t __attribute__((aligned(8),used)) attribute_used b01= 0x0101010101010101LL;
-+static uint64_t __attribute__((aligned(8),used)) attribute_used b02= 0x0202020202020202LL;
-+static uint64_t __attribute__((aligned(8),used)) attribute_used b08= 0x0808080808080808LL;
-+static uint64_t __attribute__((aligned(8),used)) attribute_used b80= 0x8080808080808080LL;
- #endif
-
- static uint8_t clip_table[3*256];
---- libvo/osd.c
-+++ libvo/osd.c
-@@ -17,9 +17,9 @@
- #endif
-
- #ifdef CAN_COMPILE_X86_ASM
--static const uint64_t bFF attribute_used __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
--static const unsigned long long mask24lh __attribute__((aligned(8))) = 0xFFFF000000000000ULL;
--static const unsigned long long mask24hl __attribute__((aligned(8))) = 0x0000FFFFFFFFFFFFULL;
-+static const uint64_t bFF attribute_used __attribute__((aligned(8),used)) = 0xFFFFFFFFFFFFFFFFULL;
-+static const unsigned long long mask24lh __attribute__((aligned(8),used)) = 0xFFFF000000000000ULL;
-+static const unsigned long long mask24hl __attribute__((aligned(8),used)) = 0x0000FFFFFFFFFFFFULL;
- #endif
-
- //Note: we have C, X86-nommx, MMX, MMX2, 3DNOW version therse no 3DNOW+MMX2 one
---- mp3lib/dct64_3dnow.c
-+++ mp3lib/dct64_3dnow.c
-@@ -12,7 +12,7 @@
- #include "config.h"
- #include "mangle.h"
-
--static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
-+static unsigned long long int attribute_used __attribute__((aligned(8),used)) x_plus_minus_3dnow = 0x8000000000000000ULL;
- static float attribute_used plus_1f = 1.0;
-
- void dct64_MMX_3dnow(real *a,real *b,real *c)
---- mp3lib/dct64_k7.c
-+++ mp3lib/dct64_k7.c
-@@ -12,7 +12,7 @@
- #include "config.h"
- #include "mangle.h"
-
--static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
-+static unsigned long long int attribute_used __attribute__((aligned(8),used)) x_plus_minus_3dnow = 0x8000000000000000ULL;
- static float attribute_used plus_1f = 1.0;
-
- void dct64_MMX_3dnowex(real *a,real *b,real *c)
-#--- mp3lib/decode_MMX.c
-#+++ mp3lib/decode_MMX.c
-#@@ -11,9 +11,9 @@
-# #include "mangle.h"
-# #define real float /* ugly - but only way */
-#
-#-static unsigned long long attribute_used __attribute__((aligned(8))) null_one = 0x0000ffff0000ffffULL;
-#-static unsigned long long attribute_used __attribute__((aligned(8))) one_null = 0xffff0000ffff0000ULL;
-#-unsigned long __attribute__((aligned(8))) costab_mmx[] =
-#+static unsigned long long attribute_used __attribute__((aligned(8),used)) null_one = 0x0000ffff0000ffffULL;
-#+static unsigned long long attribute_used __attribute__((aligned(8),used)) one_null = 0xffff0000ffff0000ULL;
-#+unsigned long __attribute__((aligned(8),used)) costab_mmx[] =
-# {
-# 1056974725,
-# 1057056395,
---- libswscale/rgb2rgb.c
-+++ libswscale/rgb2rgb.c
-@@ -72,64 +72,64 @@
- long srcStride3, long dstStride);
-
- #if defined(ARCH_X86) || defined(ARCH_X86_64)
--static const uint64_t mmx_null __attribute__((aligned(8))) = 0x0000000000000000ULL;
--static const uint64_t mmx_one __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
--static const uint64_t mask32b attribute_used __attribute__((aligned(8))) = 0x000000FF000000FFULL;
--static const uint64_t mask32g attribute_used __attribute__((aligned(8))) = 0x0000FF000000FF00ULL;
--static const uint64_t mask32r attribute_used __attribute__((aligned(8))) = 0x00FF000000FF0000ULL;
--static const uint64_t mask32 __attribute__((aligned(8))) = 0x00FFFFFF00FFFFFFULL;
--static const uint64_t mask3216br __attribute__((aligned(8)))=0x00F800F800F800F8ULL;
--static const uint64_t mask3216g __attribute__((aligned(8)))=0x0000FC000000FC00ULL;
--static const uint64_t mask3215g __attribute__((aligned(8)))=0x0000F8000000F800ULL;
--static const uint64_t mul3216 __attribute__((aligned(8))) = 0x2000000420000004ULL;
--static const uint64_t mul3215 __attribute__((aligned(8))) = 0x2000000820000008ULL;
--static const uint64_t mask24b attribute_used __attribute__((aligned(8))) = 0x00FF0000FF0000FFULL;
--static const uint64_t mask24g attribute_used __attribute__((aligned(8))) = 0xFF0000FF0000FF00ULL;
--static const uint64_t mask24r attribute_used __attribute__((aligned(8))) = 0x0000FF0000FF0000ULL;
--static const uint64_t mask24l __attribute__((aligned(8))) = 0x0000000000FFFFFFULL;
--static const uint64_t mask24h __attribute__((aligned(8))) = 0x0000FFFFFF000000ULL;
--static const uint64_t mask24hh __attribute__((aligned(8))) = 0xffff000000000000ULL;
--static const uint64_t mask24hhh __attribute__((aligned(8))) = 0xffffffff00000000ULL;
--static const uint64_t mask24hhhh __attribute__((aligned(8))) = 0xffffffffffff0000ULL;
--static const uint64_t mask15b __attribute__((aligned(8))) = 0x001F001F001F001FULL; /* 00000000 00011111 xxB */
--static const uint64_t mask15rg __attribute__((aligned(8))) = 0x7FE07FE07FE07FE0ULL; /* 01111111 11100000 RGx */
--static const uint64_t mask15s __attribute__((aligned(8))) = 0xFFE0FFE0FFE0FFE0ULL;
--static const uint64_t mask15g __attribute__((aligned(8))) = 0x03E003E003E003E0ULL;
--static const uint64_t mask15r __attribute__((aligned(8))) = 0x7C007C007C007C00ULL;
-+static const uint64_t mmx_null __attribute__((aligned(8),used)) = 0x0000000000000000ULL;
-+static const uint64_t mmx_one __attribute__((aligned(8),used)) = 0xFFFFFFFFFFFFFFFFULL;
-+static const uint64_t mask32b attribute_used __attribute__((aligned(8),used)) = 0x000000FF000000FFULL;
-+static const uint64_t mask32g attribute_used __attribute__((aligned(8),used)) = 0x0000FF000000FF00ULL;
-+static const uint64_t mask32r attribute_used __attribute__((aligned(8),used)) = 0x00FF000000FF0000ULL;
-+static const uint64_t mask32 __attribute__((aligned(8),used)) = 0x00FFFFFF00FFFFFFULL;
-+static const uint64_t mask3216br __attribute__((aligned(8),used))=0x00F800F800F800F8ULL;
-+static const uint64_t mask3216g __attribute__((aligned(8),used))=0x0000FC000000FC00ULL;
-+static const uint64_t mask3215g __attribute__((aligned(8),used))=0x0000F8000000F800ULL;
-+static const uint64_t mul3216 __attribute__((aligned(8),used)) = 0x2000000420000004ULL;
-+static const uint64_t mul3215 __attribute__((aligned(8),used)) = 0x2000000820000008ULL;
-+static const uint64_t mask24b attribute_used __attribute__((aligned(8),used)) = 0x00FF0000FF0000FFULL;
-+static const uint64_t mask24g attribute_used __attribute__((aligned(8),used)) = 0xFF0000FF0000FF00ULL;
-+static const uint64_t mask24r attribute_used __attribute__((aligned(8),used)) = 0x0000FF0000FF0000ULL;
-+static const uint64_t mask24l __attribute__((aligned(8),used)) = 0x0000000000FFFFFFULL;
-+static const uint64_t mask24h __attribute__((aligned(8),used)) = 0x0000FFFFFF000000ULL;
-+static const uint64_t mask24hh __attribute__((aligned(8),used)) = 0xffff000000000000ULL;
-+static const uint64_t mask24hhh __attribute__((aligned(8),used)) = 0xffffffff00000000ULL;
-+static const uint64_t mask24hhhh __attribute__((aligned(8),used)) = 0xffffffffffff0000ULL;
-+static const uint64_t mask15b __attribute__((aligned(8),used)) = 0x001F001F001F001FULL; /* 00000000 00011111 xxB */
-+static const uint64_t mask15rg __attribute__((aligned(8),used)) = 0x7FE07FE07FE07FE0ULL; /* 01111111 11100000 RGx */
-+static const uint64_t mask15s __attribute__((aligned(8),used)) = 0xFFE0FFE0FFE0FFE0ULL;
-+static const uint64_t mask15g __attribute__((aligned(8),used)) = 0x03E003E003E003E0ULL;
-+static const uint64_t mask15r __attribute__((aligned(8),used)) = 0x7C007C007C007C00ULL;
- #define mask16b mask15b
--static const uint64_t mask16g __attribute__((aligned(8))) = 0x07E007E007E007E0ULL;
--static const uint64_t mask16r __attribute__((aligned(8))) = 0xF800F800F800F800ULL;
--static const uint64_t red_16mask __attribute__((aligned(8))) = 0x0000f8000000f800ULL;
--static const uint64_t green_16mask __attribute__((aligned(8)))= 0x000007e0000007e0ULL;
--static const uint64_t blue_16mask __attribute__((aligned(8))) = 0x0000001f0000001fULL;
--static const uint64_t red_15mask __attribute__((aligned(8))) = 0x00007c000000f800ULL;
--static const uint64_t green_15mask __attribute__((aligned(8)))= 0x000003e0000007e0ULL;
--static const uint64_t blue_15mask __attribute__((aligned(8))) = 0x0000001f0000001fULL;
-+static const uint64_t mask16g __attribute__((aligned(8),used)) = 0x07E007E007E007E0ULL;
-+static const uint64_t mask16r __attribute__((aligned(8),used)) = 0xF800F800F800F800ULL;
-+static const uint64_t red_16mask __attribute__((aligned(8),used)) = 0x0000f8000000f800ULL;
-+static const uint64_t green_16mask __attribute__((aligned(8),used))= 0x000007e0000007e0ULL;
-+static const uint64_t blue_16mask __attribute__((aligned(8),used)) = 0x0000001f0000001fULL;
-+static const uint64_t red_15mask __attribute__((aligned(8),used)) = 0x00007c000000f800ULL;
-+static const uint64_t green_15mask __attribute__((aligned(8),used))= 0x000003e0000007e0ULL;
-+static const uint64_t blue_15mask __attribute__((aligned(8),used)) = 0x0000001f0000001fULL;
-
- #ifdef FAST_BGR2YV12
--static const uint64_t bgr2YCoeff attribute_used __attribute__((aligned(8))) = 0x000000210041000DULL;
--static const uint64_t bgr2UCoeff attribute_used __attribute__((aligned(8))) = 0x0000FFEEFFDC0038ULL;
--static const uint64_t bgr2VCoeff attribute_used __attribute__((aligned(8))) = 0x00000038FFD2FFF8ULL;
-+static const uint64_t bgr2YCoeff attribute_used __attribute__((aligned(8),used)) = 0x000000210041000DULL;
-+static const uint64_t bgr2UCoeff attribute_used __attribute__((aligned(8),used)) = 0x0000FFEEFFDC0038ULL;
-+static const uint64_t bgr2VCoeff attribute_used __attribute__((aligned(8),used)) = 0x00000038FFD2FFF8ULL;
- #else
--static const uint64_t bgr2YCoeff attribute_used __attribute__((aligned(8))) = 0x000020E540830C8BULL;
--static const uint64_t bgr2UCoeff attribute_used __attribute__((aligned(8))) = 0x0000ED0FDAC23831ULL;
--static const uint64_t bgr2VCoeff attribute_used __attribute__((aligned(8))) = 0x00003831D0E6F6EAULL;
-+static const uint64_t bgr2YCoeff attribute_used __attribute__((aligned(8),used)) = 0x000020E540830C8BULL;
-+static const uint64_t bgr2UCoeff attribute_used __attribute__((aligned(8),used)) = 0x0000ED0FDAC23831ULL;
-+static const uint64_t bgr2VCoeff attribute_used __attribute__((aligned(8),used)) = 0x00003831D0E6F6EAULL;
- #endif
--static const uint64_t bgr2YOffset attribute_used __attribute__((aligned(8))) = 0x1010101010101010ULL;
--static const uint64_t bgr2UVOffset attribute_used __attribute__((aligned(8)))= 0x8080808080808080ULL;
--static const uint64_t w1111 attribute_used __attribute__((aligned(8))) = 0x0001000100010001ULL;
-+static const uint64_t bgr2YOffset attribute_used __attribute__((aligned(8),used)) = 0x1010101010101010ULL;
-+static const uint64_t bgr2UVOffset attribute_used __attribute__((aligned(8),used))= 0x8080808080808080ULL;
-+static const uint64_t w1111 attribute_used __attribute__((aligned(8),used)) = 0x0001000100010001ULL;
-
- #if 0
--static volatile uint64_t __attribute__((aligned(8))) b5Dither;
--static volatile uint64_t __attribute__((aligned(8))) g5Dither;
--static volatile uint64_t __attribute__((aligned(8))) g6Dither;
--static volatile uint64_t __attribute__((aligned(8))) r5Dither;
-+static volatile uint64_t __attribute__((aligned(8),used)) b5Dither;
-+static volatile uint64_t __attribute__((aligned(8),used)) g5Dither;
-+static volatile uint64_t __attribute__((aligned(8),used)) g6Dither;
-+static volatile uint64_t __attribute__((aligned(8),used)) r5Dither;
-
--static uint64_t __attribute__((aligned(8))) dither4[2]={
-+static uint64_t __attribute__((aligned(8),used)) dither4[2]={
- 0x0103010301030103LL,
- 0x0200020002000200LL,};
-
--static uint64_t __attribute__((aligned(8))) dither8[2]={
-+static uint64_t __attribute__((aligned(8),used)) dither8[2]={
- 0x0602060206020602LL,
- 0x0004000400040004LL,};
- #endif
-#--- libswscale/swscale.c
-#+++ libswscale/swscale.c
-#@@ -155,51 +155,51 @@
-# #define MAX(a,b) ((a) < (b) ? (b) : (a))
-#
-# #if defined(ARCH_X86) || defined(ARCH_X86_64)
-#-static uint64_t attribute_used __attribute__((aligned(8))) bF8= 0xF8F8F8F8F8F8F8F8LL;
-#-static uint64_t attribute_used __attribute__((aligned(8))) bFC= 0xFCFCFCFCFCFCFCFCLL;
|
|
[-]
[+]
|
Added |
bug490-demux_lavf.patch
^
|
| @@ -0,0 +1,13 @@
+Index: libmpdemux/demux_lavf.c
+===================================================================
+--- libmpdemux/demux_lavf.c (revision 27511)
++++ libmpdemux/demux_lavf.c (working copy)
+@@ -115,7 +115,7 @@
+ if(pos<stream->end_pos && stream->eof)
+ stream_reset(stream);
+ current_pos = stream_tell(stream);
+- if(stream_seek(stream, pos)==0) {
++ if(pos != current_pos && stream_seek(stream, pos)==0) {
+ stream_reset(stream);
+ stream_seek(stream, current_pos);
+ return -1;
|
|
[-]
[+]
|
Deleted |
demux_audio_fix_20080129.diff
^
|
| @@ -1,13 +0,0 @@
-Index: demux_audio.c
-===================================================================
---- libmpdemux/demux_audio.c (revision 24724)
-+++ libmpdemux/demux_audio.c (working copy)
-@@ -229,6 +229,8 @@
- ptr += 4;
-
- comment = ptr;
-+ if (&comment[length] < comments || &comment[length] >= &comments[blk_len])
-+ return;
- c = comment[length];
- comment[length] = 0;
-
|
|
[-]
[+]
|
Deleted |
demux_mov_fix_20080129.diff
^
|
| @@ -1,47 +0,0 @@
-Index: demux_mov.c
-===================================================================
---- libmpdemux/demux_mov.c (revision 24724)
-+++ libmpdemux/demux_mov.c (working copy)
-@@ -173,11 +173,12 @@
- i=trak->chunkmap_size;
- while(i>0){
- --i;
-- for(j=trak->chunkmap[i].first;j<last;j++){
-+ j=FFMAX(trak->chunkmap[i].first, 0);
-+ for(;j<last;j++){
- trak->chunks[j].desc=trak->chunkmap[i].sdid;
- trak->chunks[j].size=trak->chunkmap[i].spc;
- }
-- last=trak->chunkmap[i].first;
-+ last=FFMIN(trak->chunkmap[i].first, trak->chunks_size);
- }
-
- #if 0
-@@ -235,6 +236,8 @@
- s=0;
- for(j=0;j<trak->durmap_size;j++){
- for(i=0;i<trak->durmap[j].num;i++){
-+ if (s >= trak->samples_size)
-+ break;
- trak->samples[s].pts=pts;
- ++s;
- pts+=trak->durmap[j].dur;
-@@ -246,6 +249,8 @@
- for(j=0;j<trak->chunks_size;j++){
- off_t pos=trak->chunks[j].pos;
- for(i=0;i<trak->chunks[j].size;i++){
-+ if (s >= trak->samples_size)
-+ break;
- trak->samples[s].pos=pos;
- mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d off=0x%08X size=%d\n",s,
- trak->samples[s].pts,
-@@ -1568,8 +1573,7 @@
- if( udta_len>udta_size)
- udta_len=udta_size;
- {
-- char dump[udta_len-4];
-- stream_read(demuxer->stream, (char *)&dump, udta_len-4-4);
-+ stream_skip(demuxer->stream, udta_len-4-4);
- udta_size -= udta_len;
- }
- }
|
|
[-]
[+]
|
Added |
mplayer_demux_real.patch
^
|
| @@ -0,0 +1,28 @@
+Index: libmpdemux/demux_real.c
+===================================================================
+--- libmpdemux/demux_real.c (revision 27605)
++++ libmpdemux/demux_real.c (working copy)
+@@ -947,6 +947,7 @@
+ // last fragment!
+ if(dp_hdr->len!=vpkg_length-vpkg_offset)
+ mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d frag.len=%d total.len=%d \n",dp->len,vpkg_offset,vpkg_length-vpkg_offset);
++ if (vpkg_offset > dp->len - sizeof(dp_hdr_t) - dp_hdr->len) vpkg_offset = dp->len - sizeof(dp_hdr_t) - dp_hdr->len;
+ stream_read(demuxer->stream, dp_data+dp_hdr->len, vpkg_offset);
+ if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else
+ dp_hdr->len+=vpkg_offset;
+@@ -970,6 +971,7 @@
+ // non-last fragment:
+ if(dp_hdr->len!=vpkg_offset)
+ mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d offset=%d frag.len=%d total.len=%d \n",dp->len,vpkg_offset,len,vpkg_length);
++ if (len > dp->len - sizeof(dp_hdr_t) - dp_hdr->len) len = dp->len - sizeof(dp_hdr_t) - dp_hdr->len;
+ stream_read(demuxer->stream, dp_data+dp_hdr->len, len);
+ if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else
+ dp_hdr->len+=len;
+@@ -992,6 +994,7 @@
+ extra[0]=1; extra[1]=0; // offset of the first chunk
+ if(0x00==(vpkg_header&0xc0)){
+ // first fragment:
++ if (len > dp->len - sizeof(dp_hdr_t)) len = dp->len - sizeof(dp_hdr_t);
+ dp_hdr->len=len;
+ stream_read(demuxer->stream, dp_data, len);
+ ds->asf_packet=dp;
|
|
[-]
[+]
|
Deleted |
stream_cddb_fix_20080120.diff
^
|
| @@ -1,34 +0,0 @@
-Index: stream_cddb.c
-===================================================================
---- stream/stream_cddb.c (revision 24724)
-+++ stream/stream_cddb.c (working copy)
-@@ -53,6 +53,7 @@
- #include "version.h"
- #include "stream.h"
- #include "network.h"
-+#include "libavutil/intreadwrite.h"
-
- #define DEFAULT_FREEDB_SERVER "freedb.freedb.org"
- #define DEFAULT_CACHE_DIR "/.cddb/"
-@@ -453,8 +454,9 @@
- } else {
- len = ptr2-ptr+1;
- }
-+ len = FFMIN(sizeof(album_title) - 1, len);
- strncpy(album_title, ptr, len);
-- album_title[len-2]='\0';
-+ album_title[len]='\0';
- }
- mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
- return 0;
-@@ -490,8 +492,9 @@
- } else {
- len = ptr2-ptr+1;
- }
-+ len = FFMIN(sizeof(album_title) - 1, len);
- strncpy(album_title, ptr, len);
-- album_title[len-2]='\0';
-+ album_title[len]='\0';
- }
- mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
- return cddb_request_titles(cddb_data);
|
|
[-]
[+]
|
Deleted |
url_fix_20080120.diff
^
|
| @@ -1,12 +0,0 @@
-Index: url.c
-===================================================================
---- stream/url.c (revision 24724)
-+++ stream/url.c (working copy)
-@@ -328,6 +328,7 @@
- }
- }
-
-+ tmp = NULL;
- while(i < len) {
- // look for the next char that must be kept
- for (j=i;j<len;j++) {
|
|
|
Deleted |
MPlayer-1.0rc2.tar.bz2
^
|
|
|
Added |
MPlayer-1.0rc2_r27637.tar.bz2
^
|
