aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-15 22:35:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-24 01:05:47 +0100
commit28ac4e91dcfadf1c8723489cbb7d07b72d60b755 (patch)
tree3ecfb89717103854dc65a9e1813d7f8e98e48cca
parent6b683be641b6ed8fa1acc4c482fc1e09840c5117 (diff)
downloadffmpeg-28ac4e91dcfadf1c8723489cbb7d07b72d60b755.tar.gz
avutil: rename lls to lls2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bbe66ef912470007f7cc424badde2ccec500b36b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/lpc.c2
-rw-r--r--libavutil/Makefile4
-rw-r--r--libavutil/lls2.c (renamed from libavutil/lls.c)2
-rw-r--r--libavutil/lls2.h (renamed from libavutil/lls.h)0
-rw-r--r--libavutil/x86/lls_init.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c
index 1d52edf744..198903028b 100644
--- a/libavcodec/lpc.c
+++ b/libavcodec/lpc.c
@@ -20,7 +20,7 @@
*/
#include "libavutil/common.h"
-#include "libavutil/lls.h"
+#include "libavutil/lls2.h"
#define LPC_USE_DOUBLE
#include "lpc.h"
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 21746f0713..ba759f07c0 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -89,7 +89,7 @@ OBJS = adler32.o \
intfloat_readwrite.o \
intmath.o \
lfg.o \
- lls.o \
+ lls2.o \
log.o \
log2_tab.o \
mathematics.o \
@@ -142,7 +142,7 @@ TESTPROGS = adler32 \
fifo \
hmac \
lfg \
- lls \
+ lls2 \
md5 \
murmur3 \
opt \
diff --git a/libavutil/lls.c b/libavutil/lls2.c
index abed8efaff..f381ebc3ff 100644
--- a/libavutil/lls.c
+++ b/libavutil/lls2.c
@@ -30,7 +30,7 @@
#include "attributes.h"
#include "version.h"
-#include "lls.h"
+#include "lls2.h"
static void update_lls(LLSModel *m, double *var)
{
diff --git a/libavutil/lls.h b/libavutil/lls2.h
index c62d78a230..c62d78a230 100644
--- a/libavutil/lls.h
+++ b/libavutil/lls2.h
diff --git a/libavutil/x86/lls_init.c b/libavutil/x86/lls_init.c
index 181ca38dae..b2424b3645 100644
--- a/libavutil/x86/lls_init.c
+++ b/libavutil/x86/lls_init.c
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavutil/lls.h"
+#include "libavutil/lls2.h"
#include "libavutil/x86/cpu.h"
void ff_update_lls_sse2(LLSModel *m, double *var);