diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-07-10 16:40:40 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-07-10 16:40:40 +0200 |
| commit | 48a208b2ad3fc088dffd3af0b5bfc424eadf932f (patch) | |
| tree | 9a01c9be53fa98e284b7aa13692be0345d9b8d92 /recipes/ffmpeg/ffmpeg_git.bb | |
| parent | 1edac611e10fb21b64f1eb1521a35e1e34dbd907 (diff) | |
| parent | 5e910c56c38255f8d9745d1901e7faa97f918648 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/ffmpeg/ffmpeg_git.bb')
| -rw-r--r-- | recipes/ffmpeg/ffmpeg_git.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb index eaab7f5561..bc17596b77 100644 --- a/recipes/ffmpeg/ffmpeg_git.bb +++ b/recipes/ffmpeg/ffmpeg_git.bb @@ -3,17 +3,18 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" PE = "1" -PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r39" +PV = "0.5.0+${PR}+gitr${SRCREV}" +PR = "r0" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_armv7a = "1" -FFBRANCH_arm = "arm" +#FFBRANCH_arm = "arm" FFBRANCH ?= "master" # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes -SRCREV = "997df8779ce24088d0ebf77aa36f71280785a549" -SRCREV_arm = "e4f37d7bc8ebd5e63ce57af157c2ebebfdf871fa" +SRCREV = "d886804643d7427debfa70d824de7e53ae8e3e83" +SRCREV_arm = "d886804643d7427debfa70d824de7e53ae8e3e83" SRCREV_libswscale = "b2e1c8222eeef74b0ca8053b400957dd69e18e4d" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " @@ -47,7 +48,6 @@ EXTRA_OECONF = " \ --enable-libschroedinger \ --enable-libtheora \ --enable-libvorbis \ - --enable-swscale \ --arch=${TARGET_ARCH} \ --enable-cross-compile \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ |