summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 21:47:17 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 21:47:17 +0000
commit3bb08606c22e357896714764731a7af21e04377d (patch)
tree9d459e951749c408fad9e490d547d2da352c20cb /media
parente570464a01253a25520171f967fa3e7a97c70cb6 (diff)
downloadchromium_src-3bb08606c22e357896714764731a7af21e04377d.zip
chromium_src-3bb08606c22e357896714764731a7af21e04377d.tar.gz
chromium_src-3bb08606c22e357896714764731a7af21e04377d.tar.bz2
Make FakeGlVideoDecodeEngine works in the hardware video decoding architecture
Add Preroll IPC message for finishing the initialiation of FakeGlVideoDecodeEngine. Also defined methods in WebVideoFrameImpl to access video frame textures. This change depend on a WebKit change to succesfully display the textures. BUG=53714 TEST=Tree is green. This still needs WebKit changes to work. Review URL: http://codereview.chromium.org/3472016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/filters/ffmpeg_demuxer.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 1752a4d..797481b 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -220,8 +220,6 @@ void FFmpegDemuxerStream::EnableBitstreamConverter() {
filter_name = "vc1_asftorcv";
} else if (stream_->codec->codec_id == CODEC_ID_VC1) {
filter_name = "vc1_asftoannexg";
- } else {
- NOTREACHED();
}
if (filter_name) {