diff options
| author | mek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 22:29:31 +0000 |
|---|---|---|
| committer | mek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 22:29:31 +0000 |
| commit | d5825e11bd7457e7c48bc364865a7f1b33ac9fb2 (patch) | |
| tree | 414e2bbc7c044d64cad9dc5cef7565ebe4b05654 /media/ffmpeg | |
| parent | 92668ad271d3b81e8076b60dd40744f4c11b0396 (diff) | |
| download | chromium_src-d5825e11bd7457e7c48bc364865a7f1b33ac9fb2.zip chromium_src-d5825e11bd7457e7c48bc364865a7f1b33ac9fb2.tar.gz chromium_src-d5825e11bd7457e7c48bc364865a7f1b33ac9fb2.tar.bz2 | |
Revert 194465 "media: Add support for playback for VP8 Alpha vid..."
Broke linux compilation http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Builder%20%28dbg%29&number=47451
> media: Add support for playback for VP8 Alpha video streams.
>
> BUG=147355
> TEST=VP8 Alpha video streams play
>
> Review URL: https://codereview.chromium.org/12263013
>
> Patch from Vignesh Venkatasubramanian <vigneshv@chromium.org>.
TBR=tomfinegan@chromium.org
Review URL: https://codereview.chromium.org/13972014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index cc7dfc2..12a4ec9 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -382,12 +382,6 @@ void AVStreamToVideoDecoderConfig( if (key) is_encrypted = true; - AVDictionaryEntry* webm_alpha = - av_dict_get(stream->metadata, "alpha_mode", NULL, 0); - if (webm_alpha && !strcmp(webm_alpha->value, "1")) { - format = VideoFrame::YV12A; - } - config->Initialize(codec, profile, format, @@ -496,8 +490,6 @@ VideoFrame::Format PixelFormatToVideoFormat(PixelFormat pixel_format) { case PIX_FMT_YUV420P: case PIX_FMT_YUVJ420P: return VideoFrame::YV12; - case PIX_FMT_YUVA420P: - return VideoFrame::YV12A; default: DVLOG(1) << "Unsupported PixelFormat: " << pixel_format; } @@ -510,8 +502,6 @@ PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format) { return PIX_FMT_YUV422P; case VideoFrame::YV12: return PIX_FMT_YUV420P; - case VideoFrame::YV12A: - return PIX_FMT_YUVA420P; default: DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format; } |