[FFmpeg-cvslog] r9547 - in trunk/libavcodec: cavs.h h264.c mpegvideo.h snow.c
mru
subversion
Mon Jul 9 01:14:54 CEST 2007
Author: mru
Date: Mon Jul 9 01:14:54 2007
New Revision: 9547
Log:
trivial warning fixes
Modified:
trunk/libavcodec/cavs.h
trunk/libavcodec/h264.c
trunk/libavcodec/mpegvideo.h
trunk/libavcodec/snow.c
Modified: trunk/libavcodec/cavs.h
==============================================================================
--- trunk/libavcodec/cavs.h (original)
+++ trunk/libavcodec/cavs.h Mon Jul 9 01:14:54 2007
@@ -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
Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c (original)
+++ trunk/libavcodec/h264.c Mon Jul 9 01:14:54 2007
@@ -5714,7 +5714,6 @@ static int decode_cabac_residual( H264Co
int index[64];
- int last;
int coeff_count = 0;
int abslevel1 = 1;
Modified: trunk/libavcodec/mpegvideo.h
==============================================================================
--- trunk/libavcodec/mpegvideo.h (original)
+++ trunk/libavcodec/mpegvideo.h Mon Jul 9 01:14:54 2007
@@ -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);
Modified: trunk/libavcodec/snow.c
==============================================================================
--- trunk/libavcodec/snow.c (original)
+++ trunk/libavcodec/snow.c Mon Jul 9 01:14:54 2007
@@ -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);\
More information about the ffmpeg-cvslog
mailing list