Index: media/base/android/media_codec_bridge.h |
diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h |
index 9f855beb6098cf80869c193f7ef049dce38e31e7..fbd2c1f7cc945dfed4eb8b411ea79fb1a49aeaf3 100644 |
--- a/media/base/android/media_codec_bridge.h |
+++ b/media/base/android/media_codec_bridge.h |
@@ -54,7 +54,9 @@ class MEDIA_EXPORT MediaCodecBridge { |
// DequeueInputBuffer() and DequeueOutputBuffer() become invalid. |
// Please note that this clears all the inputs in the media codec. In other |
// words, there will be no outputs until new input is provided. |
- void Reset(); |
+ // Returns MEDIA_CODEC_ERROR if unexpected error happens, or Media_CODEC_OK |
acolwell GONE FROM CHROMIUM
2013/09/06 21:37:44
nit: s/if/if an/
qinmin
2013/09/06 23:22:50
Done.
|
+ // otherwise. |
+ MediaCodecStatus Reset(); |
// Finishes the decode/encode session. The instance remains active |
// and ready to be StartAudio/Video()ed again. HOWEVER, due to the buggy |