Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 12:19:00 +0000 (13:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 12:19:00 +0000 (13:19 +0100)
* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
  lls: move to the private namespace

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/lpc.c
libavutil/lls.c
libavutil/lls.h
libavutil/version.h

@@@ -203,11 -202,8 +203,11 @@@ int ff_lpc_calc_coefs(LPCContext *s
          LLSModel m[2];
          double var[MAX_LPC_ORDER+1], av_uninit(weight);
  
 +        if(lpc_passes <= 0)
 +            lpc_passes = 2;
 +
          for(pass=0; pass<lpc_passes; pass++){
-             av_init_lls(&m[pass&1], max_order);
+             avpriv_init_lls(&m[pass&1], max_order);
  
              weight=0;
              for(i=max_order; i<blocksize; i++){
diff --cc libavutil/lls.c
Simple merge
diff --cc libavutil/lls.h
Simple merge
  #ifndef FF_API_CPU_FLAG_MMX2
  #define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 53)
  #endif
 +#ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO
 +#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 53)
 +#endif
+ #ifndef FF_API_LLS_PRIVATE
+ #define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 53)
+ #endif
  
  /**
   * @}