Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'

* commit 'eb2b8bce39c93d16a02656238248c6cf697f447f':
  bfin: Use more sensible file names

Conflicts:
	libavcodec/bfin/pixels.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

8 files changed, 10 insertions, 11 deletions

diff --git a/libavcodec/bfin/Makefile b/libavcodec/bfin/Makefile
index 4fa940b6f8..193f8e6700 100644
--- a/libavcodec/bfin/Makefile
+++ b/libavcodec/bfin/Makefile
@@ -1,10 +1,10 @@
-OBJS += bfin/dsputil_bfin.o                                             \
+OBJS += bfin/dsputil_init.o                                             \
+        bfin/dsputil.o                                                  \
         bfin/fdct_bfin.o                                                \
-        bfin/hpel_pixels_bfin.o                                         \
         bfin/hpel_pixels_no_rnd.o                                       \
         bfin/idct_bfin.o                                                \
-        bfin/pixels_bfin.o                                              \
+        bfin/pixels.o                                                   \
 
-OBJS-$(CONFIG_HPELDSP)                  += bfin/hpeldsp_bfin.o
-OBJS-$(CONFIG_VP3DSP)                   += bfin/vp3_bfin.o              \
-                                           bfin/vp3_idct_bfin.o
+OBJS-$(CONFIG_HPELDSP)                  += bfin/hpeldsp_init.o
+OBJS-$(CONFIG_VP3DSP)                   += bfin/vp3dsp_init.o           \
+                                           bfin/vp3dsp.o
diff --git a/libavcodec/bfin/pixels_bfin.S b/libavcodec/bfin/dsputil.S
index 25bdac2520..25bdac2520 100644
--- a/libavcodec/bfin/pixels_bfin.S
+++ b/libavcodec/bfin/dsputil.S
diff --git a/libavcodec/bfin/dsputil_bfin.c b/libavcodec/bfin/dsputil_init.c
index 1f24a52782..1f24a52782 100644
--- a/libavcodec/bfin/dsputil_bfin.c
+++ b/libavcodec/bfin/dsputil_init.c
diff --git a/libavcodec/bfin/hpeldsp_bfin.c b/libavcodec/bfin/hpeldsp_init.c
index 5904f0e1cd..d671e53425 100644
--- a/libavcodec/bfin/hpeldsp_bfin.c
+++ b/libavcodec/bfin/hpeldsp_init.c
@@ -27,7 +27,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/bfin/attributes.h"
 #include "libavcodec/hpeldsp.h"
-#include "hpeldsp_bfin.h"
+#include "pixels.h"
 
 void ff_bfin_put_pixels8uc_no_rnd(uint8_t *block, const uint8_t *s0,
                                   const uint8_t *s1, int line_size,
diff --git a/libavcodec/bfin/hpel_pixels_bfin.S b/libavcodec/bfin/pixels.S
index 50a3bd3aba..50a3bd3aba 100644
--- a/libavcodec/bfin/hpel_pixels_bfin.S
+++ b/libavcodec/bfin/pixels.S
diff --git a/libavcodec/bfin/hpeldsp_bfin.h b/libavcodec/bfin/pixels.h
index 5fd5a44640..78a714e1a5 100644
--- a/libavcodec/bfin/hpeldsp_bfin.h
+++ b/libavcodec/bfin/pixels.h
@@ -20,9 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
-#ifndef AVCODEC_BFIN_HPELDSP_BFIN_H
-#define AVCODEC_BFIN_HPELDSP_BFIN_H
+#ifndef AVCODEC_BFIN_PIXELS_H
+#define AVCODEC_BFIN_PIXELS_H
 
 #include <stdint.h>
 
@@ -40,4 +39,4 @@ void ff_bfin_put_pixels16uc(uint8_t *block, const uint8_t *s0,
                             const uint8_t *s1, int dest_size, int line_size,
                             int h) attribute_l1_text;
 
-#endif /* AVCODEC_BFIN_HPELDSP_BFIN_H */
+#endif /* AVCODEC_BFIN_PIXELS_H */
diff --git a/libavcodec/bfin/vp3_idct_bfin.S b/libavcodec/bfin/vp3dsp.S
index 216926c104..216926c104 100644
--- a/libavcodec/bfin/vp3_idct_bfin.S
+++ b/libavcodec/bfin/vp3dsp.S
diff --git a/libavcodec/bfin/vp3_bfin.c b/libavcodec/bfin/vp3dsp_init.c
index 0adbc9644d..0adbc9644d 100644
--- a/libavcodec/bfin/vp3_bfin.c
+++ b/libavcodec/bfin/vp3dsp_init.c