diff options
| author | 2013-07-30 10:17:08 -0700 | |
|---|---|---|
| committer | 2013-07-30 10:17:08 -0700 | |
| commit | 51cf3661fa658d7cec6a08ed3f916ce98203027c (patch) | |
| tree | 189b986b05ce5df692f593eec41e68cd93ad2a73 | |
| parent | cc4bee55fa58193073f5ba5ccebc0cc24fdb45c7 (diff) | |
| parent | f38b528701fd9bfd06adb2c9aeb7d5f951647312 (diff) | |
am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"
* commit 'f38b528701fd9bfd06adb2c9aeb7d5f951647312':
MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index fcca39054f4a..3fbaf69576fe 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -40,7 +40,8 @@ import java.util.Map; * <tr><th>Name</th><th>Value Type</th><th>Description</th></tr> * <tr><td>{@link #KEY_WIDTH}</td><td>Integer</td><td></td></tr> * <tr><td>{@link #KEY_HEIGHT}</td><td>Integer</td><td></td></tr> - * <tr><td>{@link #KEY_COLOR_FORMAT}</td><td>Integer</td><td><b>encoder-only</b></td></tr> + * <tr><td>{@link #KEY_COLOR_FORMAT}</td><td>Integer</td><td>set by the user + * for encoders, readable in the output format of decoders</b></td></tr> * <tr><td>{@link #KEY_FRAME_RATE}</td><td>Integer or Float</td><td><b>encoder-only</b></td></tr> * <tr><td>{@link #KEY_I_FRAME_INTERVAL}</td><td>Integer</td><td><b>encoder-only</b></td></tr> * </table> |