summaryrefslogtreecommitdiff
path: root/packages/ffmpeg/ffmpeg_git.bb
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-07-21 11:38:32 +0000
committerRobert Schuster <thebohemian@gmx.net>2008-07-21 11:38:32 +0000
commitb56be2db834164a767740da4b63ee35c42164086 (patch)
tree611333460a7d42b461ae975d18b5609fd223b9f4 /packages/ffmpeg/ffmpeg_git.bb
parent4f512b95406a1e0354cb64ce4e679c6ed1437b17 (diff)
parentbacf7fec4317a33c54f60e59032b4dc4f9e264d0 (diff)
merge of 'a153d288427652523d9cf6ef78faccfc723035d5'
and 'd910c68cbd1dafb9c6b77187abde5e456d8606e9'
Diffstat (limited to 'packages/ffmpeg/ffmpeg_git.bb')
-rw-r--r--packages/ffmpeg/ffmpeg_git.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index 979da0362e..b0c57288a1 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -3,7 +3,7 @@ require ffmpeg.inc
DEPENDS += "libgsm"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r15"
+PR = "r16"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv7a = "1"
@@ -12,7 +12,7 @@ FFBRANCH_arm = "arm-neon"
FFBRANCH ?= "master"
SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371"
-SRCREV_arm = "7137e7907e706300183c120703d4c9b46db93029"
+SRCREV_arm = "699f491ee2d3c3216ef16ea30ec3956f4cb583db"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"