| Index: media/filters/ffmpeg_video_decoder_unittest.cc
|
| diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
|
| index 271ce418b00723129ea9c0c0cdb7bc3ae0e87d93..8ecc83deca0bda3ad4879b1cfb45e4285be9e660 100644
|
| --- a/media/filters/ffmpeg_video_decoder_unittest.cc
|
| +++ b/media/filters/ffmpeg_video_decoder_unittest.cc
|
| @@ -224,15 +224,15 @@
|
| // Ensure decoder handles unsupported pixel formats without crashing.
|
| VideoDecoderConfig config(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN,
|
| VideoFrame::UNKNOWN,
|
| - VideoFrame::COLOR_SPACE_UNSPECIFIED, kCodedSize,
|
| - kVisibleRect, kNaturalSize, NULL, 0, false);
|
| + kCodedSize, kVisibleRect, kNaturalSize,
|
| + NULL, 0, false);
|
| InitializeWithConfigWithResult(config, false);
|
| }
|
|
|
| TEST_F(FFmpegVideoDecoderTest, Initialize_OpenDecoderFails) {
|
| // Specify Theora w/o extra data so that avcodec_open2() fails.
|
| VideoDecoderConfig config(kCodecTheora, VIDEO_CODEC_PROFILE_UNKNOWN,
|
| - kVideoFormat, VideoFrame::COLOR_SPACE_UNSPECIFIED,
|
| + kVideoFormat,
|
| kCodedSize, kVisibleRect, kNaturalSize,
|
| NULL, 0, false);
|
| InitializeWithConfigWithResult(config, false);
|
| @@ -243,7 +243,6 @@
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| - VideoFrame::COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
| @@ -258,7 +257,6 @@
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| - VideoFrame::COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
| @@ -273,7 +271,6 @@
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| - VideoFrame::COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
| @@ -288,7 +285,6 @@
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| - VideoFrame::COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
| @@ -305,7 +301,6 @@
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| - VideoFrame::COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
| @@ -321,7 +316,6 @@
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| - VideoFrame::COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
|
|