summaryrefslogtreecommitdiff
path: root/packages/ffmpeg
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-08-05 15:13:03 +0000
committerKoen Kooi <koen@openembedded.org>2008-08-05 15:13:03 +0000
commit6b03f7c90c97e7ab3d2d10b0417a32b313b68dc0 (patch)
tree3e3c7aaf82b891beb67524d3610ffad408d1cc8d /packages/ffmpeg
parent129f33074f97df1277f7cd8a54fa7b20fb1e6309 (diff)
ffmpeg git: stage swscale headers in both ffmpeg/ and libswcale/, apps can't agree on a standard location
Diffstat (limited to 'packages/ffmpeg')
-rw-r--r--packages/ffmpeg/ffmpeg_git.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index 6cc388bde1..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 = "r22"
+PR = "r23"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv5te = "1"
@@ -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