Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 23:09:56 +0000 (00:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 23:09:56 +0000 (00:09 +0100)
* qatar/master:
  configure: miscellaneous cosmetics

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -1399,7 -1198,7 +1399,8 @@@ CONFIG_LIST=
      network
      nonfree
      pic
+     pod2man
 +    raise_major
      rdft
      runtime_cpudetect
      safe_bitstream_reader
      xmm_clobber_test
  "
  
- THREADS_LIST='
+ THREADS_LIST="
      pthreads
-     w32threads
 +    os2threads
- '
+     w32threads
+ "
  
- ATOMICS_LIST='
+ ATOMICS_LIST="
      atomics_gcc
      atomics_suncc
      atomics_win32
@@@ -1491,24 -1290,18 +1492,24 @@@ ARCH_EXT_LIST=
      altivec
      ppc4xx
      vis
 +    mipsfpu
 +    mips32r2
 +    mipsdspr1
 +    mipsdspr2
  "
  
- HAVE_LIST_CMDLINE='
+ HAVE_LIST_CMDLINE="
      inline_asm
      symver
      yasm
- '
+ "
  
- HAVE_LIST_PUB='
+ HAVE_LIST_PUB="
      bigendian
      fast_unaligned
- '
 +    incompatible_libav_abi
 +    incompatible_fork_abi
+ "
  
  MATH_FUNCS="
      atanf
@@@ -1542,12 -1334,11 +1543,12 @@@ HAVE_LIST=
      $ARCH_EXT_LIST
      $(add_suffix _external $ARCH_EXT_LIST)
      $(add_suffix _inline   $ARCH_EXT_LIST)
+     $ATOMICS_LIST
      $HAVE_LIST_CMDLINE
      $HAVE_LIST_PUB
-     $THREADS_LIST
-     $ATOMICS_LIST
      $MATH_FUNCS
+     $THREADS_LIST
 +    access
      aligned_malloc
      aligned_stack
      alsa_asoundlib_h
      GetProcessAffinityMask
      GetProcessMemoryInfo
      GetProcessTimes
-     GetSystemTimeAsFileTime
      getrusage
      getservbyport
+     GetSystemTimeAsFileTime
      gettimeofday
 +    glob
 +    glXGetProcAddress
      gnu_as
 +    gnu_windres
      gsm_h
      ibm_asm
      inet_aton
-     io_h
      inline_asm_labels
+     io_h
      isatty
      jack_port_get_latency_range
 +    kbhit
      ldbrx
      libc_msvcrt
      libdc1394_1
      sys_time_h
      sys_un_h
      sys_videoio_h
+     sysconf
+     sysctl
 +    termios_h
 +    texi2html
      threads
      unistd_h
      usleep
@@@ -1744,11 -1510,9 +1745,11 @@@ CMDLINE_SELECT=
      logging
      lto
      optimizations
 +    rpath
 +    stripping
  "
  
- PATHS_LIST='
+ PATHS_LIST="
      bindir
      datadir
      docdir
@@@ -1980,9 -1724,9 +1981,9 @@@ loco_decoder_select="golomb
  mdec_decoder_select="dsputil error_resilience mpegvideo"
  metasound_decoder_select="lsp mdct sinewin"
  mimic_decoder_select="dsputil hpeldsp"
 -mjpeg_decoder_select="dsputil hpeldsp"
 +mjpeg_decoder_select="dsputil hpeldsp exif"
- mjpegb_decoder_select="mjpeg_decoder"
  mjpeg_encoder_select="aandcttables dsputil mpegvideoenc"
+ mjpegb_decoder_select="mjpeg_decoder"
  mlp_decoder_select="dsputil mlp_parser"
  motionpixels_decoder_select="dsputil"
  mp1_decoder_select="mpegaudio"
@@@ -2044,13 -1784,13 +2045,13 @@@ svq3_decoder_select="h264_decoder hpeld
  svq3_decoder_suggest="zlib"
  tak_decoder_select="dsputil"
  theora_decoder_select="vp3_decoder"
+ thp_decoder_select="mjpeg_decoder"
  tiff_decoder_suggest="zlib"
  tiff_encoder_suggest="zlib"
- thp_decoder_select="mjpeg_decoder"
 -truehd_decoder_select="mlp_decoder"
 +truehd_decoder_select="mlp_parser"
  truemotion2_decoder_select="dsputil"
  truespeech_decoder_select="dsputil"
 -tscc_decoder_deps="zlib"
 +tscc_decoder_select="zlib"
  twinvq_decoder_select="mdct lsp sinewin"
  utvideo_decoder_select="dsputil"
  utvideo_encoder_select="dsputil huffman"
@@@ -2326,10 -1999,9 +2327,10 @@@ ffrtmpcrypt_protocol_deps_any="gcrypt n
  ffrtmpcrypt_protocol_select="tcp_protocol"
  ffrtmphttp_protocol_deps="!librtmp_protocol"
  ffrtmphttp_protocol_select="http_protocol"
 +ftp_protocol_select="tcp_protocol"
  gopher_protocol_select="network"
- httpproxy_protocol_select="tcp_protocol"
  http_protocol_select="tcp_protocol"
+ httpproxy_protocol_select="tcp_protocol"
  https_protocol_select="tls_protocol"
  librtmp_protocol_deps="librtmp"
  librtmpe_protocol_deps="librtmp"
@@@ -2383,58 -2039,18 +2384,58 @@@ frei0r_filter_deps="frei0r dlopen
  frei0r_filter_extralibs='$ldl'
  frei0r_src_filter_deps="frei0r dlopen"
  frei0r_src_filter_extralibs='$ldl'
 +geq_filter_deps="gpl"
 +histeq_filter_deps="gpl"
  hqdn3d_filter_deps="gpl"
  interlace_filter_deps="gpl"
- resample_filter_deps="avresample"
 +kerndeint_filter_deps="gpl"
 +ladspa_filter_deps="ladspa dlopen"
 +mcdeint_filter_deps="avcodec gpl"
 +movie_filter_deps="avcodec avformat"
 +mp_filter_deps="gpl avcodec swscale inline_asm"
 +mpdecimate_filter_deps="gpl avcodec"
 +mptestsrc_filter_deps="gpl"
 +negate_filter_deps="lut_filter"
 +perspective_filter_deps="gpl"
  ocv_filter_deps="libopencv"
 +owdenoise_filter_deps="gpl"
 +pan_filter_deps="swresample"
 +phase_filter_deps="gpl"
 +pp_filter_deps="gpl postproc"
 +pullup_filter_deps="gpl"
 +removelogo_filter_deps="avcodec avformat swscale"
+ resample_filter_deps="avresample"
 +sab_filter_deps="gpl swscale"
  scale_filter_deps="swscale"
 +smartblur_filter_deps="gpl swscale"
 +showspectrum_filter_deps="avcodec"
 +showspectrum_filter_select="rdft"
 +spp_filter_deps="gpl avcodec"
 +spp_filter_select="fft"
 +stereo3d_filter_deps="gpl"
 +subtitles_filter_deps="avformat avcodec libass"
 +super2xsai_filter_deps="gpl"
 +tinterlace_filter_deps="gpl"
 +vidstabdetect_filter_deps="libvidstab"
 +vidstabtransform_filter_deps="libvidstab"
 +pixfmts_super2xsai_test_deps="super2xsai_filter"
 +tinterlace_merge_test_deps="tinterlace_filter"
 +tinterlace_pad_test_deps="tinterlace_filter"
 +zmq_filter_deps="libzmq"
  
  # examples
 +avio_reading="avformat avcodec avutil"
  avcodec_example_deps="avcodec avutil"
 +demuxing_decoding_example_deps="avcodec avformat avutil"
  filter_audio_example_deps="avfilter avutil"
 +filtering_audio_example_deps="avfilter avcodec avformat avutil"
 +filtering_video_example_deps="avfilter avcodec avformat avutil"
  metadata_example_deps="avformat avutil"
 -output_example_deps="avcodec avformat avutil swscale"
 -transcode_aac_example_deps="avcodec avformat avresample"
 +muxing_example_deps="avcodec avformat avutil swscale"
 +remuxing_example_deps="avcodec avformat avutil"
 +resampling_audio_example_deps="avutil swresample"
 +scaling_video_example_deps="avutil swscale"
 +transcode_aac_example_deps="avcodec avformat swresample"
  
  # libraries
  avcodec_deps="avutil"