summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-04-15 18:36:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-15 18:36:01 +0000
commitcb7032acc963e447adbffcf95ee297643d64e0d7 (patch)
tree6730cb92f1e131486be08516488b3caff5ff4f99 /libvideoeditor
parent474c6539e3592aece37616d0b39ef008b61260a0 (diff)
parente756d9753c7cffe2e9731a31fa98a3e8f37151c9 (diff)
downloadframeworks_av-cb7032acc963e447adbffcf95ee297643d64e0d7.zip
frameworks_av-cb7032acc963e447adbffcf95ee297643d64e0d7.tar.gz
frameworks_av-cb7032acc963e447adbffcf95ee297643d64e0d7.tar.bz2
Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-xlibvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
index 5309bd4..5a7237d 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
@@ -189,8 +189,8 @@ void displayMetaData(const sp<MetaData> meta) {
if (meta->findInt64(kKeyTrackTimeStatus, &int64Data)) {
LOG1("displayMetaData kKeyTrackTimeStatus %lld", int64Data);
}
- if (meta->findInt32(kKeyNotRealTime, &int32Data)) {
- LOG1("displayMetaData kKeyNotRealTime %d", int32Data);
+ if (meta->findInt32(kKeyRealTimeRecording, &int32Data)) {
+ LOG1("displayMetaData kKeyRealTimeRecording %d", int32Data);
}
}