From: Steve Kenton <skenton@ou.edu>
Date: Tue, 2 Dec 2014 00:55:35 +0000 (-0600)
Subject: ffmpeg: Add ffprobe option
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3b3b4f23317cf6b2bab4cc12a0bce9b2ceb27fdf;p=buildroot.git

ffmpeg: Add ffprobe option

Signed-off-by Stephen M. Kenton <skenton@ou.edu>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index 6fde46edb5..5f86f52c36 100644
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -49,6 +49,12 @@ config BR2_PACKAGE_FFMPEG_FFSERVER
 	help
 	  FFserver is a streaming server for both audio and video.
 
+config BR2_PACKAGE_FFMPEG_FFPROBE
+	bool "Build ffprobe"
+	help
+	  FFprobe is a utility to determine the audio and video
+	  characteristics of a container file.
+
 config BR2_PACKAGE_FFMPEG_AVRESAMPLE
 	bool "Build libavresample"
 	help
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 22577e6378..784d8b3567 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -23,7 +23,6 @@ FFMPEG_CONF_OPTS = \
 	--enable-logging \
 	--enable-optimizations \
 	--disable-extra-warnings \
-	--disable-ffprobe \
 	--enable-avdevice \
 	--enable-avcodec \
 	--enable-avformat \
@@ -104,6 +103,12 @@ else
 FFMPEG_CONF_OPTS += --disable-avresample
 endif
 
+ifeq ($(BR2_PACKAGE_FFMPEG_FFPROBE),y)
+FFMPEG_CONF_OPTS += --enable-ffprobe
+else
+FFMPEG_CONF_OPTS += --disable-ffprobe
+endif
+
 ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y)
 FFMPEG_CONF_OPTS += --enable-postproc
 else