[vlc-commits] Av* move GetVlcDspMask from avcodec.h to avcommon.h

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Oct  9 16:25:31 2012 +0200| [a41dcb952e98998de79d36e36a52ce140e06e4be] | committer: Jean-Baptiste Kempf

Av* move GetVlcDspMask from avcodec.h to avcommon.h

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

 modules/codec/avcodec/avcodec.h  |    2 --
 modules/codec/avcodec/avcommon.h |    2 ++
 modules/codec/avcodec/cpu.c      |    2 +-
 modules/demux/Modules.am         |    1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index 83d567d..a27924c 100644
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -29,8 +29,6 @@ int GetVlcFourcc( int i_ffmpeg_codec, int *pi_cat,
                   vlc_fourcc_t *pi_fourcc, const char **ppsz_name );
 void GetVlcAudioFormat( vlc_fourcc_t *, unsigned *pi_bits, int i_sample_fmt );
 
-unsigned GetVlcDspMask( void );
-
 picture_t * DecodeVideo( decoder_t *, block_t ** );
 block_t * DecodeAudio( decoder_t *, block_t ** );
 subpicture_t *DecodeSubtitle( decoder_t *p_dec, block_t ** );
diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h
index b79bd82..b3cac1c 100644
--- a/modules/codec/avcodec/avcommon.h
+++ b/modules/codec/avcodec/avcommon.h
@@ -29,6 +29,8 @@
 #include <vlc_configuration.h>
 #include <vlc_variables.h>
 
+unsigned GetVlcDspMask( void );
+
 #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
 # include <libavformat/avformat.h>
 static inline void vlc_init_avformat(void)
diff --git a/modules/codec/avcodec/cpu.c b/modules/codec/avcodec/cpu.c
index 597d367..5efbce7 100644
--- a/modules/codec/avcodec/cpu.c
+++ b/modules/codec/avcodec/cpu.c
@@ -27,7 +27,7 @@
 
 #define HAVE_MMX 1
 #include <libavcodec/avcodec.h>
-#include "avcodec.h"
+#include "avcommon.h"
 
 /**
  * Maps CPU capabilities computed by VLC to libav DSP mask.
diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 2b7ee6e..43f644d 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -44,6 +44,7 @@ libavi_plugin_la_LIBADD = $(AM_LIBADD)
 libavformat_plugin_la_SOURCES = avformat/demux.c \
 	../codec/avcodec/fourcc.c \
 	../codec/avcodec/chroma.c \
+	../codec/avcodec/cpu.c \
 	../codec/avcodec/avcommon.h \
 	vobsub.h \
 	avformat/avformat.c avformat/avformat.h