aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/ffmpeg/ffmpeg.inc
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/ffmpeg/ffmpeg.inc')
-rw-r--r--recipes/ffmpeg/ffmpeg.inc19
1 files changed, 15 insertions, 4 deletions
diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index 2b4d26e8f6..be67e61250 100644
--- a/recipes/ffmpeg/ffmpeg.inc
+++ b/recipes/ffmpeg/ffmpeg.inc
@@ -10,9 +10,9 @@ ARM_INSTRUCTION_SET = "arm"
PE = "2"
DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}"
-RSUGGESTS = "mplayer"
+RSUGGESTS_${PN} = "mplayer"
-INC_PR = "r13"
+INC_PR = "r16"
inherit autotools pkgconfig
@@ -33,7 +33,7 @@ EXTRA_OECONF = "\
"
FFMPEG_LIBS = "libavcodec libavdevice libavformat \
- libavutil libpostproc libswscale"
+ libavutil libpostproc libswscale libavfilter"
SYSROOT_PREPROCESS_FUNCS = " \
ffmpeg_stage_cleanup \
@@ -70,7 +70,10 @@ PACKAGES += "ffmpeg-x264-presets \
libavformat libavformat-dev libavformat-dbg \
libavutil libavutil-dev libavutil-dbg \
libpostproc libpostproc-dev libpostproc-dbg \
- libswscale libswscale-dev libswscale-dbg"
+ libswscale libswscale-dev libswscale-dbg \
+ libavfilter libavfilter-dev libavfilter-dbg \
+ libavcore libavcore-dev libavcore-dbg \
+ "
FILES_ffmpeg-x264-presets = "${datadir}/*.ffpreset"
@@ -98,3 +101,11 @@ FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*"
FILES_libswscale = "${libdir}/libswscale*.so.*"
FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a"
FILES_libswscale-dbg += "${libdir}/.debug/libswscale*"
+
+FILES_libavfilter = "${libdir}/libavfilter*.so.*"
+FILES_libavfilter-dev = "${libdir}/libavfilter*.so ${libdir}/pkgconfig/libavfilter.pc ${libdir}/libavfilter*.a"
+FILES_libavfilter-dbg += "${libdir}/.debug/libavfilter*"
+
+FILES_libavcore = "${libdir}/libavcore*.so.*"
+FILES_libavcore-dev = "${libdir}/libavcore*.so ${libdir}/pkgconfig/libavcore.pc ${libdir}/libavcore*.a"
+FILES_libavcore-dbg += "${libdir}/.debug/libavcore*"