Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)."

libvpx/source/libvpx/configure

Index: libvpx/source/libvpx/configure
diff --git a/libvpx/source/libvpx/configure b/libvpx/source/libvpx/configure
index 3e1e0e5e15f09ef8ba414ec31883e7ea587e1932..ab3936daf3ea969bd1a68531b7a209be9770b696 100644
--- a/libvpx/source/libvpx/configure
+++ b/libvpx/source/libvpx/configure
@@ -31,16 +31,14 @@ Advanced options:
   ${toggle_md5}                   support for output of checksum data
   ${toggle_static_msvcrt}         use static MSVCRT (VS builds only)
   ${toggle_vp8}                   VP8 codec support
-  ${toggle_internal_stats}        output of encoder internal stats for debug, if supported (encoders)
+  ${toggle_psnr}                  output of PSNR data, if supported (encoders)
   ${toggle_mem_tracker}           track memory usage
   ${toggle_postproc}              postprocessing
   ${toggle_multithread}           multithreaded encoding and decoding.
   ${toggle_spatial_resampling}    spatial sampling (scaling) support
   ${toggle_realtime_only}         enable this option while building for real-time encoding
-  ${toggle_error_concealment}     enable this option to get a decoder which is able to conceal losses
   ${toggle_runtime_cpu_detect}    runtime cpu detection
   ${toggle_shared}                shared library support
-  ${toggle_static}                static library support
   ${toggle_small}                 favor smaller size over speed
   ${toggle_postproc_visualizer}   macro block / block level visualizers
 
@@ -154,7 +152,6 @@ enabled doxygen && php -v >/dev/null 2>&1 && enable install_docs
 enable install_bins
 enable install_libs
 
-enable static
 enable optimizations
 enable fast_unaligned #allow unaligned accesses, if supported by hw
 enable md5
@@ -214,7 +211,6 @@ HAVE_LIST="
     alt_tree_layout
     pthread_h
     sys_mman_h
-    unistd_h
 "
 CONFIG_LIST="
     external_build
@@ -244,7 +240,7 @@ CONFIG_LIST="
     runtime_cpu_detect
     postproc
     multithread
-    internal_stats
+    psnr
     ${CODECS}
     ${CODEC_FAMILIES}
     encoders
@@ -252,9 +248,7 @@ CONFIG_LIST="
     static_msvcrt
     spatial_resampling
     realtime_only
-    error_concealment
     shared
-    static
     small
     postproc_visualizer
     os_support
@@ -287,16 +281,14 @@ CMDLINE_SELECT="
     dc_recon
     postproc
     multithread
-    internal_stats
+    psnr
     ${CODECS}
     ${CODEC_FAMILIES}
     static_msvcrt
     mem_tracker
     spatial_resampling
     realtime_only
-    error_concealment
     shared
-    static
     small
     postproc_visualizer
 "