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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/ffmpeg/ffmpeg_unittest.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/ffmpeg/ffmpeg_common.cc ('k') | media/filters/audio_file_reader.cc » ('j') | media/tools/media_bench/media_bench.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/ffmpeg/ffmpeg_unittest.cc
===================================================================
--- media/ffmpeg/ffmpeg_unittest.cc (revision 91003)
+++ media/ffmpeg/ffmpeg_unittest.cc (working copy)
@@ -173,10 +173,10 @@
<< "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 {
« DEPS ('K') | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/audio_file_reader.cc » ('j') | media/tools/media_bench/media_bench.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698