summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-01-04 13:12:47 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-04 13:12:47 -0800
commitc2f95fba3ab2a4e512fd1152a12e64691f2ea73d (patch)
treee6e67c73b3c937e592efae4aab771af392fa8c78
parent65a170e3ac593a29abd0c76e9aa531fabad7f56d (diff)
parent6e5cf568f4a5dee4be6ec991e1a96497303fb019 (diff)
downloadframeworks_av-c2f95fba3ab2a4e512fd1152a12e64691f2ea73d.zip
frameworks_av-c2f95fba3ab2a4e512fd1152a12e64691f2ea73d.tar.gz
frameworks_av-c2f95fba3ab2a4e512fd1152a12e64691f2ea73d.tar.bz2
Merge "Remove captureFrame from MediaMetadataRetriever.java class It has been replaced by getFrameAtTime() method"
-rw-r--r--media/libstagefright/StagefrightMetadataRetriever.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp
index ee3eefc..6331a63 100644
--- a/media/libstagefright/StagefrightMetadataRetriever.cpp
+++ b/media/libstagefright/StagefrightMetadataRetriever.cpp
@@ -260,7 +260,7 @@ VideoFrame *StagefrightMetadataRetriever::getFrameAtTime(
LOGV("getFrameAtTime: %lld us option: %d", timeUs, option);
if (0 == (mMode & METADATA_MODE_FRAME_CAPTURE_ONLY)) {
- LOGV("captureFrame disabled by mode (0x%08x)", mMode);
+ LOGV("getFrameAtTime disabled by mode (0x%08x)", mMode);
return NULL;
}