commit 613bab59b580841b0f99b0ed66845ed5744ca031
author The Android Automerger <android-build@android.com> Fri Oct 26 18:17:33 2012 -0700
committer The Android Automerger <android-build@android.com> Fri Oct 26 18:17:33 2012 -0700
tree cf924b9d1647ad1c242e6aeb6369517aef1cf0bd
parent 40017a30d11bc3c9d154e88d0c07ead1f2b51599
parent 7535c779bcd98e1636cf7f6f82ea46556dab0b73

merge in jb-mr1-release history after reset to jb-mr1-dev

media/libstagefright/wifi-display/source/Converter.h

diff --git a/media/libstagefright/wifi-display/source/Converter.h b/media/libstagefright/wifi-display/source/Converter.h
index 8dfff3d..2cdeda3 100644
--- a/media/libstagefright/wifi-display/source/Converter.h
+++ b/media/libstagefright/wifi-display/source/Converter.h
@@ -27,7 +27,7 @@
 struct ABuffer;
 struct MediaCodec;
 
-#define ENABLE_SILENCE_DETECTION        1
+#define ENABLE_SILENCE_DETECTION        0
 
 // Utility class that receives media access units and converts them into
 // media access unit of a different format.
@@ -120,4 +120,3 @@
 }  // namespace android
 
 #endif  // CONVERTER_H_
-