Merge commit 'd0adf55c05beaf80420747dded2d1884bff377ec'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 17:39:10 +0000 (18:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 17:40:29 +0000 (18:40 +0100)
* commit 'd0adf55c05beaf80420747dded2d1884bff377ec':
  configure: Split some logical blocks off from CONFIG_LIST

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -1342,14 -1156,18 +1342,27 @@@ EXTERNAL_LIBRARY_LIST=
      zlib
  "
  
 +DOCUMENT_LIST="
 +    doc
 +    htmlpages
 +    manpages
 +    podpages
 +    txtpages
 +"
 +
+ FEATURE_LIST="
++    ftrapv
+     gray
+     hardcoded_tables
+     runtime_cpudetect
+     safe_bitstream_reader
+     shared
+     small
+     sram
+     static
+     swscale_alpha
+ "
  HWACCEL_LIST="
      dxva2
      vaapi
@@@ -1370,53 -1185,47 +1383,52 @@@ LIBRARY_LIST=
      swscale
  "
  
+ LICENSE_LIST="
+     gpl
+     nonfree
+     version3
+ "
  PROGRAM_LIST="
 -    avconv
 -    avplay
 -    avprobe
 -    avserver
 +    ffplay
 +    ffprobe
 +    ffserver
 +    ffmpeg
  "
  
 -    doc
+ SUBSYSTEM_LIST="
+     dct
++    dwt
+     error_resilience
++    fast_unaligned
+     fft
+     lsp
+     lzo
+     mdct
+     network
+     rdft
+ "
  CONFIG_LIST="
      $COMPONENT_LIST
 +    $DOCUMENT_LIST
      $EXAMPLE_LIST
      $EXTERNAL_LIBRARY_LIST
+     $FEATURE_LIST
      $HWACCEL_LIST
+     $LICENSE_LIST
      $LIBRARY_LIST
      $PROGRAM_LIST
-     dct
-     dwt
-     error_resilience
-     fast_unaligned
-     fft
-     ftrapv
-     gpl
-     gray
-     hardcoded_tables
+     $SUBSYSTEM_LIST
 +    incompatible_libav_abi
 +    incompatible_fork_abi
-     lsp
-     lzo
-     mdct
      memalign_hack
 +    memory_poisoning
      neon_clobber_test
-     network
-     nonfree
      pic
      pod2man
 -    texi2html
 +    raise_major
-     rdft
-     runtime_cpudetect
-     safe_bitstream_reader
-     shared
-     small
-     sram
-     static
-     swscale_alpha
      thumb
-     version3
      xmm_clobber_test
  "