Roll ffmpeg for M47.

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/ffmpeg_demuxer.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 1017 matching lines @@
         // when using external decoder (e.g. hardware decoder), so override them
         // here, to make sure this translates into a valid VideoDecoderConfig.
         if (stream->codec->coded_width == 0 &&
             stream->codec->coded_height == 0) {
           DCHECK(stream->codec->width > 0);
           DCHECK(stream->codec->height > 0);
           stream->codec->coded_width = stream->codec->width;
           stream->codec->coded_height = stream->codec->height;
         }
         if (stream->codec->pix_fmt == AV_PIX_FMT_NONE) {
-          stream->codec->pix_fmt = PIX_FMT_YUV420P;
+          stream->codec->pix_fmt = AV_PIX_FMT_YUV420P;
         }
       }
 #endif
       // Log the codec detected, whether it is supported or not.
       UMA_HISTOGRAM_SPARSE_SLOWLY("Media.DetectedVideoCodecHash",
                                   GetCodecHash(codec_context));
 
       // Ensure the codec is supported. IsValidConfig() also checks that the
       // frame size and visible size are valid.
       AVStreamToVideoDecoderConfig(stream, &video_config);
@@ skipping 408 matching lines @@
 
 void FFmpegDemuxer::SetLiveness(DemuxerStream::Liveness liveness) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   for (const auto& stream : streams_) {  // |stream| is a ref to a pointer.
     if (stream)
       stream->SetLiveness(liveness);
   }
 }
 
 }  // namespace media