diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-08-06 15:14:45 +0000 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-08-06 15:14:45 +0000 |
| commit | c5718e16d08d73a48642840dd8ad532734fb5942 (patch) | |
| tree | 9e793953076377647d4d86ba1e53c041cacf760f /packages/ffmpeg | |
| parent | 86acccc82f46060f45e78abd587c857c6f72986b (diff) | |
| parent | 09e038b5a358d364a95269a1aed5940a6b913471 (diff) | |
merge of '55132066284089ca5853bcbb50bbd4990ec25823'
and '5565cda387e227c33c34f8743f541e7737fc5b1b'
Diffstat (limited to 'packages/ffmpeg')
| -rw-r--r-- | packages/ffmpeg/ffmpeg_git.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index c93261283f..0cbfce233c 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 = "r21" +PR = "r23" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" @@ -44,7 +44,7 @@ EXTRA_OECONF = " \ --enable-libfaadbin \ --enable-libgsm \ --enable-libmp3lame \ - --disable-swscale \ + --enable-swscale \ --arch=${TARGET_ARCH} \ --enable-cross-compile \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ @@ -93,8 +93,9 @@ do_stage() { install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/libavutil/$h done - install -m 0644 ${S}/libswscale/swscale.h ${STAGING_INCDIR}/ffmpeg/swscale.h - install -m 0644 ${S}/libswscale/rgb2rgb.h ${STAGING_INCDIR}/ffmpeg/rgb2rgb.h + install -d ${STAGING_INCDIR}/libswscale/ + install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/ + install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/ install -d ${STAGING_INCDIR}/libpostproc install -d ${STAGING_INCDIR}/postproc |