virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

cosmetics: consistent function declarations

Browse Source 
Originally committed as revision 15907 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2008-11-22 16:03:20 +00:00
parent 7d1b158284
commit 7f8205da4c
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/svq3.c
View File

@ -114,7 +114,8 @@ static const uint32_t svq3_dequant_coeff[32] = {
}; };
static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp){ static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp)
{
const int qmul= svq3_dequant_coeff[qp]; const int qmul= svq3_dequant_coeff[qp];
#define stride 16 #define stride 16
int i; int i;
@ -150,7 +151,8 @@ static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp){
} }
#undef stride #undef stride
static void svq3_add_idct_c (uint8_t *dst, DCTELEM *block, int stride, int qp, int dc){ static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc)
{
const int qmul= svq3_dequant_coeff[qp]; const int qmul= svq3_dequant_coeff[qp];
int i; int i;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
@ -186,9 +188,9 @@ static void svq3_add_idct_c (uint8_t *dst, DCTELEM *block, int stride, int qp, i
} }
} }
static inline int svq3_decode_block (GetBitContext *gb, DCTELEM *block, static inline int svq3_decode_block(GetBitContext *gb, DCTELEM *block,
int index, const int type) { int index, const int type)
{
static const uint8_t *const scan_patterns[4] = static const uint8_t *const scan_patterns[4] =
{ luma_dc_zigzag_scan, zigzag_scan, svq3_scan, chroma_dc_scan }; { luma_dc_zigzag_scan, zigzag_scan, svq3_scan, chroma_dc_scan };
@ -243,11 +245,11 @@ static inline int svq3_decode_block (GetBitContext *gb, DCTELEM *block,
return 0; return 0;
} }
static inline void svq3_mc_dir_part (MpegEncContext *s, static inline void svq3_mc_dir_part(MpegEncContext *s,
int x, int y, int width, int height, int x, int y, int width, int height,
int mx, int my, int dxy, int mx, int my, int dxy,
int thirdpel, int dir, int avg) { int thirdpel, int dir, int avg)
{
const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture; const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture;
uint8_t *src, *dest; uint8_t *src, *dest;
int i, emu = 0; int i, emu = 0;
@ -305,8 +307,9 @@ static inline void svq3_mc_dir_part (MpegEncContext *s,
} }
} }
static inline int svq3_mc_dir (H264Context *h, int size, int mode, int dir, int avg) { static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir,
int avg)
{
int i, j, k, mx, my, dx, dy, x, y; int i, j, k, mx, my, dx, dy, x, y;
MpegEncContext *const s = (MpegEncContext *) h; MpegEncContext *const s = (MpegEncContext *) h;
const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1); const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1);
@ -411,7 +414,8 @@ static inline int svq3_mc_dir (H264Context *h, int size, int mode, int dir, int
return 0; return 0;
} }
static int svq3_decode_mb (H264Context *h, unsigned int mb_type) { static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
{
int i, j, k, m, dir, mode; int i, j, k, m, dir, mode;
int cbp = 0; int cbp = 0;
uint32_t vlc; uint32_t vlc;
@ -685,7 +689,8 @@ static int svq3_decode_mb (H264Context *h, unsigned int mb_type) {
return 0; return 0;
} }
static int svq3_decode_slice_header (H264Context *h) { static int svq3_decode_slice_header(H264Context *h)
{
MpegEncContext *const s = (MpegEncContext *) h; MpegEncContext *const s = (MpegEncContext *) h;
const int mb_xy = h->mb_xy; const int mb_xy = h->mb_xy;
int i, header; int i, header;
@ -768,9 +773,10 @@ static int svq3_decode_slice_header (H264Context *h) {
return 0; return 0;
} }
static int svq3_decode_frame (AVCodecContext *avctx, static int svq3_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
const uint8_t *buf, int buf_size) { const uint8_t *buf, int buf_size)
{
MpegEncContext *const s = avctx->priv_data; MpegEncContext *const s = avctx->priv_data;
H264Context *const h = avctx->priv_data; H264Context *const h = avctx->priv_data;
int m, mb_type; int m, mb_type;