FFmpeg fixups for M33 roll. Now with more Opus!

media/base/media_file_checker.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/base/media_file_checker.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/time/time.h"
@@ skipping 42 matching lines @@
       if (codec && avcodec_open2(c, codec, NULL) >= 0)
         stream_contexts[i] = c;
     }
   }
 
   if (stream_contexts.size() == 0)
     return false;
 
   AVPacket packet;
   scoped_ptr_malloc<AVFrame, media::ScopedPtrAVFreeFrame> frame(
-      avcodec_alloc_frame());
+      av_frame_alloc());
   int result = 0;
 
   base::Time deadline = base::Time::Now() +
       std::min(check_time,
                base::TimeDelta::FromSeconds(kMaxCheckTimeInSeconds));
   do {
     result = av_read_frame(glue.format_context(), &packet);
     if (result < 0)
       break;
     result = av_dup_packet(&packet);
@@ skipping 27 matching lines @@
       result = avcodec_decode_video2(av_context, frame.get(), &frame_decoded,
                                      &packet);
     }
     av_free_packet(&packet);
   } while (base::Time::Now() < deadline && read_ok && result >= 0);
 
   return read_ok && (result == AVERROR_EOF || result >= 0);
 }
 
 }  // namespace media