From 6d86b77056ed63eb6871182f42a9fd5f07550f90 Mon Sep 17 00:00:00 2001
From: "Torne (Richard Coles)" <torne@google.com>
Date: Wed, 25 Jun 2014 10:30:53 +0100
Subject: Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
---
 media/filters/decoder_stream.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'media/filters/decoder_stream.h')

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
   };
-- 
cgit v1.2.3