diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 20:16:56 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 20:16:56 +0000 |
| commit | 8b2cec537f3678716180467ddffaf3caa4594777 (patch) | |
| tree | 92262e0c53924d5f96d08cfae918730a16e024da /media/base/pipeline.h | |
| parent | ce34fe575bdff24570c078184e81373bd240069b (diff) | |
| download | chromium_src-8b2cec537f3678716180467ddffaf3caa4594777.zip chromium_src-8b2cec537f3678716180467ddffaf3caa4594777.tar.gz chromium_src-8b2cec537f3678716180467ddffaf3caa4594777.tar.bz2 | |
Revert tree bustage cause by r11904.
TBR=agl
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline.h')
| -rw-r--r-- | media/base/pipeline.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/base/pipeline.h b/media/base/pipeline.h index 58883cc..f5b91ff 100644 --- a/media/base/pipeline.h +++ b/media/base/pipeline.h @@ -12,9 +12,12 @@ #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: @@ -32,7 +35,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, |