trivial warning fixes
Originally committed as revision 9547 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
3b26ee4719
commit
bad700e346
@ -404,8 +404,6 @@ static inline void init_mb(AVSContext *h) {
|
||||
h->col_type = &h->col_type_base[h->mby*h->mb_width + h->mbx];
|
||||
}
|
||||
|
||||
static inline void check_for_slice(AVSContext *h);
|
||||
|
||||
/**
|
||||
* save predictors for later macroblocks and increase
|
||||
* macroblock address
|
||||
|
@ -5714,7 +5714,6 @@ static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n
|
||||
|
||||
int index[64];
|
||||
|
||||
int last;
|
||||
int coeff_count = 0;
|
||||
|
||||
int abslevel1 = 1;
|
||||
|
@ -871,7 +871,7 @@ int ff_h263_resync(MpegEncContext *s);
|
||||
int ff_h263_get_gob_height(MpegEncContext *s);
|
||||
void ff_mpeg4_init_direct_mv(MpegEncContext *s);
|
||||
int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my);
|
||||
int ff_h263_round_chroma(int x);
|
||||
inline int ff_h263_round_chroma(int x);
|
||||
void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code);
|
||||
|
||||
|
||||
|
@ -2350,7 +2350,7 @@ static void decode_blocks(SnowContext *s){
|
||||
}
|
||||
}
|
||||
|
||||
static void mc_block(uint8_t *dst, uint8_t *src, uint8_t *tmp, int stride, int b_w, int b_h, int dx, int dy){
|
||||
static void mc_block(uint8_t *dst, const uint8_t *src, uint8_t *tmp, int stride, int b_w, int b_h, int dx, int dy){
|
||||
int x, y;
|
||||
START_TIMER
|
||||
for(y=0; y < b_h+5; y++){
|
||||
@ -2420,7 +2420,7 @@ STOP_TIMER("mc_block")
|
||||
}
|
||||
|
||||
#define mca(dx,dy,b_w)\
|
||||
static void mc_block_hpel ## dx ## dy ## b_w(uint8_t *dst, uint8_t *src, int stride, int h){\
|
||||
static void mc_block_hpel ## dx ## dy ## b_w(uint8_t *dst, const uint8_t *src, int stride, int h){\
|
||||
uint8_t tmp[stride*(b_w+5)];\
|
||||
assert(h==b_w);\
|
||||
mc_block(dst, src-2-2*stride, tmp, stride, b_w, b_w, dx, dy);\
|
||||
|
Loading…
Reference in New Issue
Block a user