[FFmpeg-cvslog] avcodec/v210dec: Add ff prefix to v210_x86_init()

Michael Niedermayer git at videolan.org
Fri Feb 27 19:33:49 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 27 19:08:09 2015 +0100| [23a90768a87432ae945a97c7e9e90c53330b9f74] | committer: Michael Niedermayer

avcodec/v210dec: Add ff prefix to v210_x86_init()

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

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

 libavcodec/v210dec.c       |    4 ++--
 libavcodec/v210dec.h       |    2 +-
 libavcodec/x86/v210-init.c |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c
index ae03952..f1e968d 100644
--- a/libavcodec/v210dec.c
+++ b/libavcodec/v210dec.c
@@ -63,7 +63,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
     s->unpack_frame            = v210_planar_unpack_c;
 
     if (HAVE_MMX)
-        v210_x86_init(s);
+        ff_v210_x86_init(s);
 
     return 0;
 }
@@ -101,7 +101,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     if (aligned_input != s->aligned_input) {
         s->aligned_input = aligned_input;
         if (HAVE_MMX)
-            v210_x86_init(s);
+            ff_v210_x86_init(s);
     }
 
     if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
diff --git a/libavcodec/v210dec.h b/libavcodec/v210dec.h
index a8db7d6..533afc4 100644
--- a/libavcodec/v210dec.h
+++ b/libavcodec/v210dec.h
@@ -31,6 +31,6 @@ typedef struct {
     void (*unpack_frame)(const uint32_t *src, uint16_t *y, uint16_t *u, uint16_t *v, int width);
 } V210DecContext;
 
-void v210_x86_init(V210DecContext *s);
+void ff_v210_x86_init(V210DecContext *s);
 
 #endif /* AVCODEC_V210DEC_H */
diff --git a/libavcodec/x86/v210-init.c b/libavcodec/x86/v210-init.c
index 02c5eaa..dfdfd26 100644
--- a/libavcodec/x86/v210-init.c
+++ b/libavcodec/x86/v210-init.c
@@ -25,7 +25,7 @@ extern void ff_v210_planar_unpack_unaligned_avx(const uint32_t *src, uint16_t *y
 extern void ff_v210_planar_unpack_aligned_ssse3(const uint32_t *src, uint16_t *y, uint16_t *u, uint16_t *v, int width);
 extern void ff_v210_planar_unpack_aligned_avx(const uint32_t *src, uint16_t *y, uint16_t *u, uint16_t *v, int width);
 
-av_cold void v210_x86_init(V210DecContext *s)
+av_cold void ff_v210_x86_init(V210DecContext *s)
 {
     int cpu_flags = av_get_cpu_flags();
 



More information about the ffmpeg-cvslog mailing list