ffmpeg chromium glue

media/filters/chunk_demuxer.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.
 
 // Implements a Demuxer that can switch among different data sources mid-stream.
 // Uses FFmpegDemuxer under the covers, so see the caveats at the top of
 // ffmpeg_demuxer.h.
 
 #include "media/filters/chunk_demuxer.h"
 
@@ skipping 516 matching lines @@
 bool ChunkDemuxer::SetupStreams() {
   int result = av_find_stream_info(format_context_);
 
   if (result < 0)
     return false;
 
   bool no_supported_streams = true;
   for (size_t i = 0; i < format_context_->nb_streams; ++i) {
     AVStream* stream = format_context_->streams[i];
     AVCodecContext* codec_context = stream->codec;
-    CodecType codec_type = codec_context->codec_type;
+    AVMediaType codec_type = codec_context->codec_type;
 
-    if (codec_type == CODEC_TYPE_AUDIO &&
+    if (codec_type == AVMEDIA_TYPE_AUDIO &&
         stream->codec->codec_id == CODEC_ID_VORBIS &&
         !audio_.get()) {
       audio_ = new ChunkDemuxerStream(DemuxerStream::AUDIO, stream);
       no_supported_streams = false;
       continue;
     }
 
-    if (codec_type == CODEC_TYPE_VIDEO &&
+    if (codec_type == AVMEDIA_TYPE_VIDEO &&
         stream->codec->codec_id == CODEC_ID_VP8 &&
         !video_.get()) {
       video_ = new ChunkDemuxerStream(DemuxerStream::VIDEO, stream);
       no_supported_streams = false;
       continue;
     }
   }
 
   return !no_supported_streams;
 }
@@ skipping 52 matching lines @@
   }
 
   // TODO(acolwell) : make this more representative of what is actually
   // buffered.
   buffered_bytes_ += length;
 
   return true;
 }
 
 }  // namespace media