diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-07-15 13:47:45 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-07-15 13:47:45 +0000 |
| commit | 3322f34e58688590d963c98d1aa79c9f3d1f4288 (patch) | |
| tree | 36ee47cd5b9ed9e7be72091ee73aaa2938c1d925 /packages | |
| parent | 9271cfee20d1bdc311303da8551a90beed45dc54 (diff) | |
| parent | ec3798a3228ae2bba42b60ec0cc3c7fdafaf2b54 (diff) | |
merge of '3a2808f816787c38cc33d4ad7c1d8ec24cf3f97d'
and 'bab230e17300cd6d489ec78a189a3c829743cdd4'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/ffmpeg/ffmpeg_git.bb | 4 | ||||
| -rw-r--r-- | packages/ffmpeg/omapfbplay_git.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 548d5a5139..979da0362e 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 = "r14" +PR = "r15" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" @@ -12,7 +12,7 @@ FFBRANCH_arm = "arm-neon" FFBRANCH ?= "master" SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371" -SRCREV_arm = "3ea1180b31078c276783f68e153ec54cfe567977" +SRCREV_arm = "7137e7907e706300183c120703d4c9b46db93029" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb index b8e092def6..9494e57d33 100644 --- a/packages/ffmpeg/omapfbplay_git.bb +++ b/packages/ffmpeg/omapfbplay_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays" DEPENDS = "bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" -PR = "r4" +PR = "r5" inherit module-base |