mpegvideo: wmv2: Move function declarations

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 0e08a8df70e6a6d05e02a0be9c85b438aab24a50..3d0d1dee266c9fb863164a31ba84550cedfdb1d3 100644 (file)
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -39,6 +39,7 @@
 #include "msmpeg4.h"
 #include "qpeldsp.h"
 #include "thread.h"
+#include "wmv2.h"
 
 static enum AVPixelFormat h263_get_format(AVCodecContext *avctx)
 {

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 4294eb61792efaabb6043582222c592fe3515f77..49f2e661773ab5dcb59c250a1e461a7d39bfb9b2 100644 (file)
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -44,6 +44,7 @@
 #include "qpeldsp.h"
 #include "xvmc_internal.h"
 #include "thread.h"
+#include "wmv2.h"
 #include <limits.h>
 
 static const uint8_t ff_default_chroma_qscale_table[32] = {

diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 4eff4d9f0b1df51ece71d9b7d204223e397f442c..9c226ccfb506ec5edf6365720fabdaf67e313340 100644 (file)
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -851,17 +851,6 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s);
 int ff_msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size);
 int ff_msmpeg4_decode_init(AVCodecContext *avctx);
 int ff_msmpeg4_encode_init(MpegEncContext *s);
-int ff_wmv2_decode_picture_header(MpegEncContext * s);
-int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s);
-void ff_wmv2_add_mb(MpegEncContext *s, int16_t block[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr);
-void ff_mspel_motion(MpegEncContext *s,
-                               uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
-                               uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
-                               int motion_x, int motion_y, int h);
-int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number);
-void ff_wmv2_encode_mb(MpegEncContext * s,
-                       int16_t block[6][64],
-                       int motion_x, int motion_y);
 
 int ff_mpeg_ref_picture(AVCodecContext *avctx, Picture *dst, Picture *src);
 void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *picture);

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 15cca64c492d62e15a390dba5529fb6ef06fa7d5..a47781812ff38fde0192ed46b890f2665354c682 100644 (file)
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -56,6 +56,7 @@
 #include "mpeg4video.h"
 #include "internal.h"
 #include "bytestream.h"
+#include "wmv2.h"
 #include <limits.h>
 
 #define QUANT_BIAS_SHIFT 8

diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c
index 95414d1230a3a91533f6631e6b84953e5091247f..a25b251af20e99923c56578a24172097d694b0ab 100644 (file)
--- a/libavcodec/mpegvideo_motion.c
+++ b/libavcodec/mpegvideo_motion.c
@@ -31,6 +31,7 @@
 #include "mjpegenc.h"
 #include "msmpeg4.h"
 #include "qpeldsp.h"
+#include "wmv2.h"
 #include <limits.h>
 
 static void gmc1_motion(MpegEncContext *s,

diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index 0a8ecd9e23f3568aa3e2a255385cecc4e5f76e94..23138dc07330067083f6315f5f1860aca229c330 100644 (file)
--- a/libavcodec/msmpeg4.h
+++ b/libavcodec/msmpeg4.h
@@ -54,7 +54,6 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block,
                             int n, int coded, const uint8_t *scan_table);
 int ff_msmpeg4_pred_dc(MpegEncContext *s, int n,
                        int16_t **dc_val_ptr, int *dir_ptr);
-int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
 
 #define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \
                                 CONFIG_MSMPEG4V2_DECODER || \

diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index 2fc2de1968058ffa46b446ad3b65d63fc5c4a4e4..bc3cd7629ba653c4b8b7a0f8a4de4f8332e8d6ab 100644 (file)
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -32,6 +32,7 @@
 #include "mpeg4video.h"
 #include "msmpeg4data.h"
 #include "vc1data.h"
+#include "wmv2.h"
 
 #define DC_VLC_BITS 9
 #define V2_INTRA_CBPC_VLC_BITS 3

diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h
index 03a85147ad8b919e2f51517cd1ad21b47fe4cb59..b77dd98cd5d8f914a679ddc371d530a0577fec5c 100644 (file)
--- a/libavcodec/wmv2.h
+++ b/libavcodec/wmv2.h
@@ -56,4 +56,18 @@ typedef struct Wmv2Context {
 
 void ff_wmv2_common_init(Wmv2Context *w);
 
+int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
+int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number);
+void ff_wmv2_encode_mb(MpegEncContext * s, int16_t block[6][64],
+                       int motion_x, int motion_y);
+int ff_wmv2_decode_picture_header(MpegEncContext * s);
+int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s);
+void ff_wmv2_add_mb(MpegEncContext *s, int16_t block[6][64],
+                    uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr);
+
+void ff_mspel_motion(MpegEncContext *s,
+                     uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
+                     uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
+                     int motion_x, int motion_y, int h);
+
 #endif /* AVCODEC_WMV2_H */