[FFmpeg-cvslog] Merge commit 'd1a91ebe4990001e0800ee9ac54ed2207e4f56ff'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Fri Mar 31 11:24:11 2017 +0200| [d62606480f41ac26ec98be45166cc11530276e83] | committer: Clément Bœsch

Merge commit 'd1a91ebe4990001e0800ee9ac54ed2207e4f56ff'

* commit 'd1a91ebe4990001e0800ee9ac54ed2207e4f56ff':
  configure: Print list of enabled programs

This commit is mostly a noop, see 832b4a4a438b73d720878d77aa3db46b08d79937

Merged-by: Clément Bœsch <cboesch at gopro.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d62606480f41ac26ec98be45166cc11530276e83
---

 configure | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 0264afb..e90041e 100755
--- a/configure
+++ b/configure
@@ -6606,10 +6606,6 @@ test -n "$random_seed" &&
     echo "random seed               ${random_seed}"
 echo
 
-echo "Enabled programs:"
-print_enabled '' $PROGRAM_LIST | print_in_columns
-echo
-
 echo "External libraries:"
 print_enabled '' $EXTERNAL_LIBRARY_LIST | print_in_columns
 echo
@@ -6622,6 +6618,10 @@ echo "Libraries:"
 print_enabled '' $LIBRARY_LIST | print_in_columns
 echo
 
+echo "Programs:"
+print_enabled '' $PROGRAM_LIST | print_in_columns
+echo
+
 for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf indev outdev; do
     echo "Enabled ${type}s:"
     eval list=\$$(toupper $type)_LIST


======================================================================

diff --cc configure
index 0264afb,a6617b5..e90041e
--- a/configure
+++ b/configure
@@@ -6606,22 -5181,21 +6606,22 @@@ test -n "$random_seed" &
      echo "random seed               ${random_seed}"
  echo
  
- echo "Enabled programs:"
- print_enabled '' $PROGRAM_LIST | print_in_columns
- echo
- 
  echo "External libraries:"
 -print_enabled '' $EXTERNAL_LIBRARY_LIST | print_3_columns
 +print_enabled '' $EXTERNAL_LIBRARY_LIST | print_in_columns
  echo
 +
  echo "External libraries providing hardware acceleration:"
 -print_enabled '' $HWACCEL_LIBRARY_LIST | print_3_columns
 +print_enabled '' $HWACCEL_LIBRARY_LIST | print_in_columns
  echo
  
  echo "Libraries:"
 -print_enabled '' $LIBRARY_LIST | print_3_columns
 +print_enabled '' $LIBRARY_LIST | print_in_columns
  echo
  
+ echo "Programs:"
 -print_enabled '' $PROGRAM_LIST | print_3_columns
++print_enabled '' $PROGRAM_LIST | print_in_columns
+ echo
+ 
  for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf indev outdev; do
      echo "Enabled ${type}s:"
      eval list=\$$(toupper $type)_LIST