ffmpeg chromium glue

media/ffmpeg/ffmpeg_unittest.cc

 // Copyright (c) 2011 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.
 
 // ffmpeg_unittests verify that the parts of the FFmpeg API that Chromium uses
 // function as advertised for each media format that Chromium supports.  This
 // mostly includes stuff like reporting proper timestamps, seeking to
 // keyframes, and supporting certain features like reordered_opaque.
 //
 // Known failures as of r54591:
@@ skipping 155 matching lines @@
       AVCodecContext* av_codec_context = av_stream->codec;
       AVCodec* av_codec = avcodec_find_decoder(av_codec_context->codec_id);
 
       EXPECT_TRUE(av_codec)
           << "Could not find AVCodec with CodecID "
           << av_codec_context->codec_id;
       EXPECT_EQ(0, avcodec_open(av_codec_context, av_codec))
           << "Could not open AVCodecContext with CodecID "
           << av_codec_context->codec_id;
 
-      if (av_codec->type == CODEC_TYPE_AUDIO) {
+      if (av_codec->type == AVMEDIA_TYPE_AUDIO) {
         EXPECT_EQ(-1, audio_stream_index_) << "Found multiple audio streams.";
         audio_stream_index_ = static_cast<int>(i);
-      } else if (av_codec->type == CODEC_TYPE_VIDEO) {
+      } else if (av_codec->type == AVMEDIA_TYPE_VIDEO) {
         EXPECT_EQ(-1, video_stream_index_) << "Found multiple video streams.";
         video_stream_index_ = static_cast<int>(i);
       } else {
         ADD_FAILURE() << "Found unknown stream type.";
       }
     }
   }
 
   void CloseCodecs() {
     for (unsigned int i = 0; i < av_format_context_->nb_streams; ++i) {
@@ skipping 456 matching lines @@
   SeekTo(0.4);
   ReadRemainingFile();
   EXPECT_TRUE(StepDecodeVideo());
   VLOG(1) << decoded_video_time();
 
   CloseCodecs();
   CloseFile();
 }
 
 }  // namespace media