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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 2093007: Chromium side changes for enabling VP8 and WebM support. (Closed)
Patch Set: Final fixes Created 10 years, 7 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
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | net/base/mime_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 8c3cb6a1793fcc3eb07f4a985baed4bbe509393e..31d575f0dc4e8afbb22e585c8dfe08f10ebadcb4 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -79,6 +79,7 @@ class FFmpegDemuxerTest : public testing::Test {
// Initialize FFmpeg fixtures.
memset(&format_context_, 0, sizeof(format_context_));
+ memset(&input_format_, 0, sizeof(input_format_));
memset(&streams_, 0, sizeof(streams_));
memset(&codecs_, 0, sizeof(codecs_));
@@ -96,6 +97,9 @@ class FFmpegDemuxerTest : public testing::Test {
codecs_[AV_STREAM_AUDIO].channels = kChannels;
codecs_[AV_STREAM_AUDIO].sample_rate = kSampleRate;
+ input_format_.name = "foo";
+ format_context_.iformat = &input_format_;
+
// Initialize AVStream and AVFormatContext structures. We set the time base
// of the streams such that duration is reported in microseconds.
format_context_.nb_streams = AV_STREAM_MAX;
@@ -162,6 +166,7 @@ class FFmpegDemuxerTest : public testing::Test {
// FFmpeg fixtures.
AVFormatContext format_context_;
+ AVInputFormat input_format_;
AVCodecContext codecs_[AV_STREAM_MAX];
AVStream streams_[AV_STREAM_MAX];
MockFFmpeg mock_ffmpeg_;
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | net/base/mime_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698