Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 16:21:29 +0000 (18:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 16:21:35 +0000 (18:21 +0200)
* commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d':
  ppc: Drop unnecessary ff_ name prefixes from static functions
  x86: Drop unnecessary ff_ name prefixes from static functions
  arm: Drop unnecessary ff_ name prefixes from static functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/h264dsp_init_arm.c
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/rv40dsp_init_arm.c
libavcodec/ppc/fft_altivec.c
libavcodec/ppc/h264dsp.c
libavcodec/x86/cavsdsp.c
libavcodec/x86/h264_qpel.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/hpeldsp_avg_template.c
libavcodec/x86/hpeldsp_init.c
libswscale/ppc/yuv2rgb_altivec.c

@@@ -68,10 -68,9 +68,10 @@@ void ff_h264_idct8_add4_neon(uint8_t *d
                               int16_t *block, int stride,
                               const uint8_t nnzc[6*8]);
  
- static av_cold void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth,
-                                          const int chroma_format_idc)
+ static av_cold void h264dsp_init_neon(H264DSPContext *c, const int bit_depth,
+                                       const int chroma_format_idc)
  {
 +#if HAVE_NEON
      if (bit_depth == 8) {
      c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon;
      c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon;
@@@ -45,11 -45,10 +45,11 @@@ void ff_pred8x8_0lt_dc_neon(uint8_t *sr
  void ff_pred8x8_l00_dc_neon(uint8_t *src, ptrdiff_t stride);
  void ff_pred8x8_0l0_dc_neon(uint8_t *src, ptrdiff_t stride);
  
- static av_cold void ff_h264_pred_init_neon(H264PredContext *h, int codec_id,
-                                            const int bit_depth,
-                                            const int chroma_format_idc)
+ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
+                                         const int bit_depth,
+                                         const int chroma_format_idc)
  {
 +#if HAVE_NEON
      const int high_depth = bit_depth > 8;
  
      if (high_depth)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge