aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-10-05 09:32:26 +0200
committerKoen Kooi <koen@openembedded.org>2010-10-05 09:32:26 +0200
commit8e35a2ac8fd5965d6a9b0ea030b741a86e7c0de6 (patch)
tree91a3b46486778c64d8a2a28999535c26e76deb54
parent653f9f0f698d91ca9b0ac958c9679c101c591eb0 (diff)
downloadopenembedded-8e35a2ac8fd5965d6a9b0ea030b741a86e7c0de6.zip
openembedded-8e35a2ac8fd5965d6a9b0ea030b741a86e7c0de6.tar.gz
openembedded-8e35a2ac8fd5965d6a9b0ea030b741a86e7c0de6.tar.bz2
mplayer svn: make swscale accept larger input images regardless of arch
-rw-r--r--recipes/mplayer/mplayer/vofw-swscale.diff16
-rw-r--r--recipes/mplayer/mplayer_svn.bb3
2 files changed, 18 insertions, 1 deletions
diff --git a/recipes/mplayer/mplayer/vofw-swscale.diff b/recipes/mplayer/mplayer/vofw-swscale.diff
new file mode 100644
index 0000000..6a6b82c
--- /dev/null
+++ b/recipes/mplayer/mplayer/vofw-swscale.diff
@@ -0,0 +1,16 @@
+Needed for encoding large images with mencoder or grabbing large image from a v4l src
+
+--- /tmp/swscale_internal.h 2010-10-05 09:15:42.000000000 +0200
++++ trunk/libswscale/swscale_internal.h 2010-10-05 09:16:07.000000000 +0200
+@@ -33,11 +33,7 @@
+
+ #define MAX_FILTER_SIZE 256
+
+-#if ARCH_X86
+ #define VOFW 5120
+-#else
+-#define VOFW 2048 // faster on PPC and not tested on others
+-#endif
+
+ #define VOF (VOFW*2)
+
diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index 42907d1..8ecee88 100644
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -18,6 +18,7 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
file://codecs_conf-VP8.diff;striplevel=0 \
file://demux_mkv-V_VP8__webm_doctype.diff;striplevel=0 \
file://configure-libvpx_test.diff \
+ file://vofw-swscale.diff \
"
SRCREV = "30165"
@@ -43,7 +44,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
RREPLACES_${PN} = "mplayer-atty"
PV = "0.0+1.0rc3+svnr${SRCPV}"
-PR = "r25"
+PR = "r26"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_angstrom = "1"
DEFAULT_PREFERENCE_shr = "1"