diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-07-17 18:07:12 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-07-17 18:07:12 +0000 |
| commit | 12f8a39939c28003a39b84713d9a51305511650d (patch) | |
| tree | 2235c3d2a30eac66c0319b7cff55928990c89bbd /packages/ffmpeg | |
| parent | 058132b8be45ac2041a574782b8800c1956e44d3 (diff) | |
| parent | fcbe107913b10643d1ba8ac137de273e12e8854a (diff) | |
merge of '470ca3fe64c9411d3a7d992db39d5efbed869839'
and '912f388483a3e1703ca89d7b2309723fd3407420'
Diffstat (limited to 'packages/ffmpeg')
| -rw-r--r-- | packages/ffmpeg/ffmpeg_git.bb | 6 | ||||
| -rw-r--r-- | packages/ffmpeg/omapfbplay_git.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 0c9936a2f9..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 = "r10" +PR = "r15" 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 = "4cc48b756abd09baa7b31909ebbc0c09be2c8e5a" +SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371" +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 e87550207f..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 = "r3" +PR = "r5" inherit module-base |