diff options
| author | 2013-03-08 17:51:24 +0000 | |
|---|---|---|
| committer | 2013-03-08 17:51:24 +0000 | |
| commit | 01eaa2d545a0b0dc28f8f13e6db7348bb6e098e3 (patch) | |
| tree | 507eea68c644f2c34c78a278ab65435e2f323a53 | |
| parent | 6916c6ee105e7e91f494ec79c24152fb64d8eed1 (diff) | |
| parent | 47a2db4943ea5c094a97a1627ff886409c2b31f0 (diff) | |
Merge "Tweak comment." into jb-mr2-dev
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index bdee6fa7453d..b6b49a287d9e 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -263,8 +263,8 @@ final public class MediaCodec { Surface surface, MediaCrypto crypto, int flags); /** - * Requests a Surface to use instead of input buffers. This may only be called after - * {@link #configure} and before {@link #start}. + * Requests a Surface to use as the input to an encoder, in place of input buffers. This + * may only be called after {@link #configure} and before {@link #start}. * <p> * The application is responsible for calling release() on the Surface when * done. |