diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 19:09:28 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 19:09:28 +0000 |
| commit | d77ed9ef01dd6508ed6f153acbe71f95b9f38480 (patch) | |
| tree | e4da61afea4578827b57e411e284462e500293ee /media/base/pipeline.h | |
| parent | 8d439a694371cfdd95c0c03ff452c9096d3cc7f3 (diff) | |
| download | chromium_src-d77ed9ef01dd6508ed6f153acbe71f95b9f38480.zip chromium_src-d77ed9ef01dd6508ed6f153acbe71f95b9f38480.tar.gz chromium_src-d77ed9ef01dd6508ed6f153acbe71f95b9f38480.tar.bz2 | |
Checking in media::FFmpegGlue, media::FFmpegDemuxer and tests.
Fixes build break by including FFmpeg dependency for media project in chrome.sln.
This is a second attempt at committing the following changelists:
http://codereview.chromium.org/39295
http://codereview.chromium.org/28165
TBR=darin
Review URL: http://codereview.chromium.org/42029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline.h')
| -rw-r--r-- | media/base/pipeline.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/base/pipeline.h b/media/base/pipeline.h index da3dfc4..58883cc 100644 --- a/media/base/pipeline.h +++ b/media/base/pipeline.h @@ -31,7 +31,12 @@ enum PipelineError { PIPELINE_ERROR_REQUIRED_FILTER_MISSING, PIPELINE_ERROR_OUT_OF_MEMORY, PIPELINE_ERROR_COULD_NOT_RENDER, - PIPELINE_ERROR_READ + PIPELINE_ERROR_READ, + + // Demuxer related errors. + DEMUXER_ERROR_COULD_NOT_OPEN, + DEMUXER_ERROR_COULD_NOT_PARSE, + DEMUXER_ERROR_NO_SUPPORTED_STREAMS, }; // Base class for Pipeline class which allows for read-only access to members. |