New commits:
commit bb47987fea4737bd4125b6f90aadc6c3920551c3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg: corrected selection for program disabling
(cherry picked from commit 9c958b2f185fd9c6bd6e4fb2bdd1aeb20f26d6d7)
Conflicts:
video/ffmpeg/HISTORY
diff --git a/video/ffmpeg/BUILD b/video/ffmpeg/BUILD
index 0d38a09..6c6d89f 100755
--- a/video/ffmpeg/BUILD
+++ b/video/ffmpeg/BUILD
@@ -6,7 +6,7 @@ elif list_find "$FFMPEG_PROGRAMS" "all"; then
:
else
for program in $FFMPEG_PROGRAM_LIST; do
- if ! list_find "$program" "$FFMPEG_PROGRAMS"; then
+ if ! list_find "$FFMPEG_PROGRAMS" "$program"; then
OPTS="--disable-$program $OPTS"
fi
done &&
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 3b9e51e..00935a5 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2016-09-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: corrected selection for program disabling
+
2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: opengl/libwebp support is available only in stable branch
* CONFIGURE: decklink is available only in stable branch
[SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (bb47987fea4737bd4125b6f90aadc6c3920551c3),
Vlad Glagolev, 09/21/2016