Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1666)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/chunk_demuxer.cc

Issue 6993042: ffmpeg chromium glue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: removing divx and xdiv Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« DEPS ('K') | « media/filters/bitstream_converter_unittest.cc ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | media/tools/media_bench/media_bench.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.cc
===================================================================
--- media/filters/chunk_demuxer.cc (revision 91003)
+++ media/filters/chunk_demuxer.cc (working copy)
@@ -534,9 +534,9 @@
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);
@@ -544,7 +544,7 @@
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);
« DEPS ('K') | « media/filters/bitstream_converter_unittest.cc ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | media/tools/media_bench/media_bench.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698