diff options
| author | shrikant@chromium.org <shrikant@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 22:32:30 +0000 |
|---|---|---|
| committer | shrikant@chromium.org <shrikant@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 22:32:30 +0000 |
| commit | eaeb1eab7fdd5688bae38ee3e9e5d5d09d03348d (patch) | |
| tree | f105e8211f0329f861a0c94b4c287d938548f788 /media/filters | |
| parent | 47c852dc80dc26c7d16f62eb14ef34fe8443b57b (diff) | |
| download | chromium_src-eaeb1eab7fdd5688bae38ee3e9e5d5d09d03348d.zip chromium_src-eaeb1eab7fdd5688bae38ee3e9e5d5d09d03348d.tar.gz chromium_src-eaeb1eab7fdd5688bae38ee3e9e5d5d09d03348d.tar.bz2 | |
Revert 233046 "Remove RGB32 from VideoFrame::Format."
(Reverting as it seem to break ChromeOS, please re-land as soon as fixed.)
> Remove RGB32 from VideoFrame::Format.
>
> It wasn't used anywhere outside of the unit tests.
>
> BUG=313827
> TBR=danakj
>
> Review URL: https://codereview.chromium.org/56713002
TBR=rileya@chromium.org
Review URL: https://codereview.chromium.org/60393004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/filters')
| -rw-r--r-- | media/filters/video_renderer_base_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc index db87b61..84d356d 100644 --- a/media/filters/video_renderer_base_unittest.cc +++ b/media/filters/video_renderer_base_unittest.cc @@ -186,7 +186,7 @@ class VideoRendererBaseTest : public ::testing::Test { gfx::Size natural_size = TestVideoConfig::NormalCodedSize(); scoped_refptr<VideoFrame> frame = VideoFrame::CreateFrame( - VideoFrame::YV12, natural_size, gfx::Rect(natural_size), natural_size, + VideoFrame::RGB32, natural_size, gfx::Rect(natural_size), natural_size, next_frame_timestamp_); decode_results_.push_back(std::make_pair( VideoDecoder::kOk, frame)); |