diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-09-20 13:35:46 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-09-20 13:35:46 +0000 |
| commit | 6b20643cf56d475b1c39c20dffc7f46fb8fc7d52 (patch) | |
| tree | b1c5b4af17b2f357854dd277d10d33d3f3f7ecc2 /packages/mplayer | |
| parent | 00e9bd3dc6ad3fe960926f8867976cf0ca8bfedd (diff) | |
| parent | 17f206c22d95debcff4dd22a9729849a766be84c (diff) | |
merge of '4c89fe83f0f196ebd6c0ae47cf90bf2134df3c1e'
and 'eee5593805c1b699d11b41c5bf39860df0d24ca6'
Diffstat (limited to 'packages/mplayer')
| -rw-r--r-- | packages/mplayer/files/simple_idct_armv5te.S | 2 | ||||
| -rw-r--r-- | packages/mplayer/mplayer_svn.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/mplayer/files/simple_idct_armv5te.S b/packages/mplayer/files/simple_idct_armv5te.S index f43fd19785..3706f3a4ea 100644 --- a/packages/mplayer/files/simple_idct_armv5te.S +++ b/packages/mplayer/files/simple_idct_armv5te.S @@ -25,7 +25,7 @@ .arch armv5te /* IMPORTANT: this value should be the same as defined in dsputil.h */ -#define MAX_NEG_CROP 2048 +#define MAX_NEG_CROP 1024 /* * ARM EABI guarantees 8 byte stack alignment, so we can use LDRD instructions diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index 73b1fbcc5f..fb2989fa93 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -35,7 +35,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc1+svnr${SRCREV}" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" PARALLEL_MAKE = "" |