diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-16 17:31:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-16 17:31:58 +0000 |
| commit | 036ffbce1b8ca4032f05feab5e35c67212cb265e (patch) | |
| tree | f9f8e78708cd62dc9e21b23956102037463d3a8b | |
| parent | 0c2eb84264c5c5a9f4c9e7187bf926296ee49511 (diff) | |
| parent | 842e82f6b8d85c71469f4decdfd5d1a486d55881 (diff) | |
| download | android_frameworks_ex-036ffbce1b8ca4032f05feab5e35c67212cb265e.tar.gz android_frameworks_ex-036ffbce1b8ca4032f05feab5e35c67212cb265e.tar.bz2 android_frameworks_ex-036ffbce1b8ca4032f05feab5e35c67212cb265e.zip | |
am 842e82f6: Merge "Move libvariablespeed to libc++."
* commit '842e82f6b8d85c71469f4decdfd5d1a486d55881':
Move libvariablespeed to libc++.
| -rw-r--r-- | variablespeed/jni/Android.mk | 6 | ||||
| -rw-r--r-- | variablespeed/jni/ring_buffer.cc | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/variablespeed/jni/Android.mk b/variablespeed/jni/Android.mk index ef6ff78..98b9325 100644 --- a/variablespeed/jni/Android.mk +++ b/variablespeed/jni/Android.mk @@ -17,8 +17,6 @@ include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk # TODO: Remove the .cc extension, just .cpp. -# TODO: Change module name to use underscores not hyphens. -# TODO: Work out if the log and android libs are needed. # Add in extra warnings. LOCAL_CFLAGS += -Wall @@ -40,9 +38,7 @@ LOCAL_C_INCLUDES := \ LOCAL_SHARED_LIBRARIES := \ libOpenSLES \ - libutils \ - libcutils \ liblog \ -include external/stlport/libstlport.mk +LOCAL_CLANG := true include $(BUILD_SHARED_LIBRARY) diff --git a/variablespeed/jni/ring_buffer.cc b/variablespeed/jni/ring_buffer.cc index fb014d3..61c1490 100644 --- a/variablespeed/jni/ring_buffer.cc +++ b/variablespeed/jni/ring_buffer.cc @@ -16,6 +16,8 @@ #include "ring_buffer.h" +#include <algorithm> + #include "integral_types.h" namespace video_editing { @@ -68,7 +70,7 @@ int RingBuffer::overhead() const { } int64 RingBuffer::GetTail() const { - return *min_element(readers_.begin(), readers_.end()); + return *std::min_element(readers_.begin(), readers_.end()); } int64 RingBuffer::Tell(int reader) const { |