mpegvideo: wmv2: Move function declarations
This commit is contained in:
		@@ -39,6 +39,7 @@
 | 
			
		||||
#include "msmpeg4.h"
 | 
			
		||||
#include "qpeldsp.h"
 | 
			
		||||
#include "thread.h"
 | 
			
		||||
#include "wmv2.h"
 | 
			
		||||
 | 
			
		||||
static enum AVPixelFormat h263_get_format(AVCodecContext *avctx)
 | 
			
		||||
{
 | 
			
		||||
 
 | 
			
		||||
@@ -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] = {
 | 
			
		||||
 
 | 
			
		||||
@@ -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);
 | 
			
		||||
 
 | 
			
		||||
@@ -56,6 +56,7 @@
 | 
			
		||||
#include "mpeg4video.h"
 | 
			
		||||
#include "internal.h"
 | 
			
		||||
#include "bytestream.h"
 | 
			
		||||
#include "wmv2.h"
 | 
			
		||||
#include <limits.h>
 | 
			
		||||
 | 
			
		||||
#define QUANT_BIAS_SHIFT 8
 | 
			
		||||
 
 | 
			
		||||
@@ -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,
 | 
			
		||||
 
 | 
			
		||||
@@ -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 || \
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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 */
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user