Index: media/filters/gpu_video_decoder.cc |
diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc |
index 54845214bb138195a69ba075b5582318230d2f2f..ba01671913f751f4aa37956c5c0ede085c1bed5d 100644 |
--- a/media/filters/gpu_video_decoder.cc |
+++ b/media/filters/gpu_video_decoder.cc |
@@ -154,7 +154,8 @@ void GpuVideoDecoder::Initialize(const VideoDecoderConfig& config, |
BindToCurrentLoop(orig_status_cb)); |
bool previously_initialized = config_.IsValidConfig(); |
-#if !defined(OS_CHROMEOS) && !defined(OS_WIN) |
+#if !defined(OS_CHROMEOS) && !defined(OS_WIN) && \ |
+ !(defined(OS_LINUX) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)) |
if (previously_initialized) { |
// TODO(xhwang): Make GpuVideoDecoder reinitializable. |
// See http://crbug.com/233608 |