summaryrefslogtreecommitdiff
path: root/packages/ffmpeg/ffmpeg_git.bb
diff options
context:
space:
mode:
authorThomas Kunze <thommycheck@gmx.de>2008-08-04 15:13:29 +0000
committerThomas Kunze <thommycheck@gmx.de>2008-08-04 15:13:29 +0000
commit29f6b384ef2899fda7d18b990622a9b30a7aa8d2 (patch)
tree00c1880e6891890663fc95ff9d3f12e631c26b36 /packages/ffmpeg/ffmpeg_git.bb
parent615fc240efab913c303ec3a464c341cbddba4687 (diff)
parent89b85eda60769fe941a2e64ea4d296617befc2af (diff)
merge of '0675e9a3e7f3d9faa1311df4548be2e200c02760'
and 'ed7f086a6f3dc6bc06899e467a960cd37d7f2a9c'
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 d05e65d281..c93261283f 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 = "r20"
+PR = "r21"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv5te = "1"
@@ -14,7 +14,7 @@ FFBRANCH_arm = "arm-neon"
FFBRANCH ?= "master"
SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a"
-SRCREV_arm = "af7bda5224b6cdfb0c1f03686d2a6b631a455668"
+SRCREV_arm = "3c4b8ba71b922be6559fcfea3cb990ea3ded234d"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"