summaryrefslogtreecommitdiffstats
path: root/media/base/pipeline.h
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 20:04:29 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 20:04:29 +0000
commit40e5ac1f115a7905372d3414debaac63a5244886 (patch)
tree1613d237a6e69e0d1f95b1953b8b2572a9f5b52a /media/base/pipeline.h
parentb0c2bda2081e3627baac5814d6c66ef121b88515 (diff)
downloadchromium_src-40e5ac1f115a7905372d3414debaac63a5244886.zip
chromium_src-40e5ac1f115a7905372d3414debaac63a5244886.tar.gz
chromium_src-40e5ac1f115a7905372d3414debaac63a5244886.tar.bz2
andrew's patch
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline.h')
-rw-r--r--media/base/pipeline.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index f5b91ff..58883cc 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -12,12 +12,9 @@
#include <string>
#include "base/task.h"
+#include "base/time.h"
#include "media/base/factory.h"
-namespace base {
- class TimeDelta;
-}
-
namespace media {
// Error definitions for pipeline. All codes indicate an error except:
@@ -35,7 +32,7 @@ enum PipelineError {
PIPELINE_ERROR_OUT_OF_MEMORY,
PIPELINE_ERROR_COULD_NOT_RENDER,
PIPELINE_ERROR_READ,
- PIPELINE_ERROR_AUDIO_HARDWARE,
+
// Demuxer related errors.
DEMUXER_ERROR_COULD_NOT_OPEN,
DEMUXER_ERROR_COULD_NOT_PARSE,