Roll FFmpeg DEPS + Fixup FFmpeg tests.

Pulls in the security fix for issue 152691 and adds a test for the
problematic file.  Additionally fixes a few issues which have led
to rusting:
- Updates hashes after AudioBus::ToInterleaved() changes.
- Fixes a bunch of EXPECT_CALL failures and log spam since not all
tests will satisfy these expectations due to invalid files.
- Fixes a bug in the hashing code when NullAudioSink is never
initialized.

BUG=152691
TEST=unit tests.

Review URL: https://codereview.chromium.org/10989089

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159352 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 1 deletions

diff --git a/media/audio/null_audio_sink.cc b/media/audio/null_audio_sink.cc
index eab0479..c93ceb1 100644
--- a/media/audio/null_audio_sink.cc
+++ b/media/audio/null_audio_sink.cc
@@ -121,14 +121,17 @@ std::string NullAudioSink::GetAudioHashForTesting() {
   DCHECK(hash_audio_for_testing_);
 
   // If initialize failed or was never called, ensure we return an empty hash.
+  int channels = 1;
   if (!initialized_) {
     md5_channel_contexts_.reset(new base::MD5Context[1]);
     base::MD5Init(&md5_channel_contexts_[0]);
+  } else {
+    channels = audio_bus_->channels();
   }
 
   // Hash all channels into the first channel.
   base::MD5Digest digest;
-  for (int i = 1; i < audio_bus_->channels(); i++) {
+  for (int i = 1; i < channels; i++) {
     base::MD5Final(&digest, &md5_channel_contexts_[i]);
     base::MD5Update(&md5_channel_contexts_[0], base::StringPiece(
         reinterpret_cast<char*>(&digest), sizeof(base::MD5Digest)));