diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:30:53 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:30:53 +0100 |
| commit | 6d86b77056ed63eb6871182f42a9fd5f07550f90 (patch) | |
| tree | 4bd56255660f52e406fbd45083c006cd6ddb2877 /media/filters/decoder_stream.h | |
| parent | e9f930807da3850e29ecc641d2becc0403b5709c (diff) | |
| download | chromium_org-6d86b77056ed63eb6871182f42a9fd5f07550f90.tar.gz | |
Merge from Chromium at DEPS revision 278856
This commit was generated by merge_to_master.py.
Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
Diffstat (limited to 'media/filters/decoder_stream.h')
| -rw-r--r-- | media/filters/decoder_stream.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h index 1a36558674..7cb78738da 100644 --- a/media/filters/decoder_stream.h +++ b/media/filters/decoder_stream.h @@ -121,6 +121,7 @@ class MEDIA_EXPORT DecoderStream { STATE_FLUSHING_DECODER, STATE_PENDING_DEMUXER_READ, STATE_REINITIALIZING_DECODER, + STATE_END_OF_STREAM, // End of stream reached; returns EOS on all reads. STATE_STOPPED, STATE_ERROR }; |