[FFmpeg-cvslog] avutil: rename lls to lls2

[Michael Niedermayer]

ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 15 22:35:46 2013 +0100| [d89e14bf54c886441eb919d2588ccc2ce6050706] | committer: Michael Niedermayer

avutil: rename lls to lls2

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bbe66ef912470007f7cc424badde2ccec500b36b)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d89e14bf54c886441eb919d2588ccc2ce6050706
---

 libavcodec/lpc.c            |    2 +-
 libavutil/Makefile          |    4 ++--
 libavutil/{lls.c => lls2.c} |    2 +-
 libavutil/{lls.h => lls2.h} |    0
 libavutil/x86/lls_init.c    |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c
index 1d52edf..1989030 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 7b3b439..5d42893 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -90,7 +90,7 @@ OBJS = adler32.o                                                        \
        intfloat_readwrite.o                                             \
        intmath.o                                                        \
        lfg.o                                                            \
-       lls.o                                                            \
+       lls2.o                                                           \
        log.o                                                            \
        log2_tab.o                                                       \
        mathematics.o                                                    \
@@ -143,7 +143,7 @@ TESTPROGS = adler32                                                     \
             fifo                                                        \
             hmac                                                        \
             lfg                                                         \
-            lls                                                         \
+            lls2                                                        \
             md5                                                         \
             murmur3                                                     \
             opt                                                         \
diff --git a/libavutil/lls.c b/libavutil/lls2.c
similarity index 99%
rename from libavutil/lls.c
rename to libavutil/lls2.c
index abed8ef..f381ebc 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
similarity index 100%
rename from libavutil/lls.h
rename to libavutil/lls2.h
diff --git a/libavutil/x86/lls_init.c b/libavutil/x86/lls_init.c
index 181ca38..b2424b3 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);