[SCM] libebur128/master: Imported Upstream version 1.0.2
andrewrk-guest at users.alioth.debian.org
andrewrk-guest at users.alioth.debian.org
Sun Sep 28 23:39:40 UTC 2014
The following commit has been merged in the master branch:
commit b4064bc2bf48dff6f12291d987e386bee2a93f02
Author: Andrew Kelley <superjoe30 at gmail.com>
Date: Sun Sep 28 23:35:19 2014 +0000
Imported Upstream version 1.0.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1652cd..3353a28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
include(utils)
+include(GNUInstallDirs)
add_subdirectory(ebur128)
add_subdirectory(test)
diff --git a/ebur128/CMakeLists.txt b/ebur128/CMakeLists.txt
index 558e522..1a13bb2 100644
--- a/ebur128/CMakeLists.txt
+++ b/ebur128/CMakeLists.txt
@@ -47,6 +47,9 @@ set_target_properties(ebur128 PROPERTIES
SOVERSION ${EBUR128_VERSION_MAJOR}
VERSION ${EBUR128_VERSION})
+if(UNIX)
+ target_link_libraries(ebur128 -lm)
+endif(UNIX)
if(SPEEXDSP_FOUND AND NOT DISABLE_SPEEXDSP)
set_property(TARGET ebur128_static APPEND_STRING PROPERTY
@@ -60,5 +63,5 @@ endif()
set(SUMMARY_SPEEXDSP_FOUND ${SPEEXDSP_FOUND} CACHE INTERNAL "")
set(EBUR128_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
-install(FILES ebur128.h DESTINATION include)
-install(TARGETS ebur128 ebur128_static DESTINATION lib)
+install(FILES ebur128.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(TARGETS ebur128 ebur128_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/ebur128/ebur128.c b/ebur128/ebur128.c
index d59f8e9..3364734 100644
--- a/ebur128/ebur128.c
+++ b/ebur128/ebur128.c
@@ -264,7 +264,7 @@ ebur128_state* ebur128_init(unsigned int channels,
} else if ((mode & EBUR128_MODE_M) == EBUR128_MODE_M) {
st->d->audio_data_frames = st->d->samples_in_100ms * 4;
} else {
- return NULL;
+ goto free_true_peak;
}
st->d->audio_data = (double*) malloc(st->d->audio_data_frames *
st->channels *
diff --git a/ebur128/ebur128.h b/ebur128/ebur128.h
index 02be47f..497a2a1 100644
--- a/ebur128/ebur128.h
+++ b/ebur128/ebur128.h
@@ -51,7 +51,7 @@ enum mode {
EBUR128_MODE_M = (1 << 0),
/** can call ebur128_loudness_shortterm */
EBUR128_MODE_S = (1 << 1) | EBUR128_MODE_M,
- /** can call ebur128_gated_loudness_* */
+ /** can call ebur128_loudness_global_* */
EBUR128_MODE_I = (1 << 2) | EBUR128_MODE_M,
/** can call ebur128_loudness_range */
EBUR128_MODE_LRA = (1 << 3) | EBUR128_MODE_S,
--
libebur128 packaging
More information about the pkg-multimedia-commits
mailing list