Combine audio decoding and video decoding onto a single thread.

webkit/media/filter_helpers.cc

Index: webkit/media/filter_helpers.cc
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index 9ae007ced88fb826274b76db490221f4f4476436..5975679ef8c4a7561fce3814e43619cacdd68be2 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -25,13 +25,13 @@ static void AddDefaultDecodersToCollection(
   filter_collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
       base::Bind(&media::MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory),
-                 media::MessageLoopFactory::kAudioDecoder)));
+                 media::MessageLoopFactory::kDecoder)));
 
   scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder =
       new media::FFmpegVideoDecoder(
           base::Bind(&media::MessageLoopFactory::GetMessageLoop,
                      base::Unretained(message_loop_factory),
-                     media::MessageLoopFactory::kVideoDecoder),
+                     media::MessageLoopFactory::kDecoder),
           decryptor);
   filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder);
 }