From 3b3b4f23317cf6b2bab4cc12a0bce9b2ceb27fdf Mon Sep 17 00:00:00 2001 From: Steve Kenton Date: Mon, 1 Dec 2014 18:55:35 -0600 Subject: [PATCH] ffmpeg: Add ffprobe option Signed-off-by Stephen M. Kenton Signed-off-by: Peter Korsgaard --- package/ffmpeg/Config.in | 6 ++++++ package/ffmpeg/ffmpeg.mk | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index 6fde46edb..5f86f52c3 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 22577e637..784d8b356 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