diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-07-14 11:20:50 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-07-14 11:20:50 +0000 |
| commit | 4fa9f2080e8d8fd8220976415b2bd7bde3ccc620 (patch) | |
| tree | ee97d97d541aa249e9c3a839b7418af7053fec26 /packages/ffmpeg | |
| parent | 4afec386e30fba9df25eaa0457c1e3c20f5ca974 (diff) | |
| parent | 31775c318bdd3b8f62d281aa84e7ad166b78aa79 (diff) | |
merge of 'd39fcbb20e8ed63ddeb563f8bcffc41b528163cd'
and 'dff33d19f55f5e1289901a814a5e358b4a4a9981'
Diffstat (limited to 'packages/ffmpeg')
| -rw-r--r-- | packages/ffmpeg/ffmpeg_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 294b6afc22..548d5a5139 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 = "r12" +PR = "r14" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" @@ -11,8 +11,8 @@ DEFAULT_PREFERENCE_armv7a = "1" FFBRANCH_arm = "arm-neon" FFBRANCH ?= "master" -SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d" -SRCREV_arm = "749766cea9969418633abb77b6c8677a884dfcb9" +SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371" +SRCREV_arm = "3ea1180b31078c276783f68e153ec54cfe567977" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " |