FFmpeg fixups for M33 roll. Now with more Opus!

media/cdm/ppapi/ffmpeg_cdm_video_decoder.cc

 // Copyright 2013 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/cdm/ppapi/ffmpeg_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/buffers.h"
 #include "media/base/limits.h"
@@ skipping 156 matching lines @@
     LOG(ERROR) << "Initialize(): avcodec_find_decoder failed.";
     return false;
   }
 
   int status;
   if ((status = avcodec_open2(codec_context_.get(), codec, NULL)) < 0) {
     LOG(ERROR) << "Initialize(): avcodec_open2 failed: " << status;
     return false;
   }
 
-  av_frame_.reset(avcodec_alloc_frame());
+  av_frame_.reset(av_frame_alloc());
   is_initialized_ = true;
 
   return true;
 }
 
 void FFmpegCdmVideoDecoder::Deinitialize() {
   DVLOG(1) << "Deinitialize()";
   ReleaseFFmpegResources();
   is_initialized_ = false;
 }
@@ skipping 138 matching lines @@
 }
 
 void FFmpegCdmVideoDecoder::ReleaseFFmpegResources() {
   DVLOG(1) << "ReleaseFFmpegResources()";
 
   codec_context_.reset();
   av_frame_.reset();
 }
 
 }  // namespace media