diff options
| author | Måns Rullgård <mans@mansr.com> | 2007-07-08 23:14:54 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2007-07-08 23:14:54 +0000 |
| commit | bad700e34652ad45071321f8782d85d3685f0da8 (patch) | |
| tree | 14a4b6b66664d8834b328a8565d8492bb35150cf /libavcodec | |
| parent | 3b26ee4719a4f2c1d5b71a09492593b5569ea745 (diff) | |
trivial warning fixes
Originally committed as revision 9547 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/cavs.h | 2 | ||||
| -rw-r--r-- | libavcodec/h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 | ||||
| -rw-r--r-- | libavcodec/snow.c | 4 |
4 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h index 3c6ef46ec2..adc9c2452f 100644 --- a/libavcodec/cavs.h +++ b/libavcodec/cavs.h @@ -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 diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1d4b8d4397..5c79f42464 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 7935a71441..d4a11aaf08 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -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); diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 0acded9bbb..b62f49ac15 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -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);\ |