mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-24 00:02:52 +00:00
warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
Originally committed as revision 3156 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
4fc2c6447f
commit
4df8ca9df2
@ -123,7 +123,7 @@ static uint64_t __attribute__((aligned(8))) attribute_used b80= 0x808080808080
|
||||
static uint8_t clip_table[3*256];
|
||||
static uint8_t * const clip_tab= clip_table + 256;
|
||||
|
||||
static int verbose= 0;
|
||||
static const int verbose= 0;
|
||||
|
||||
static const int attribute_used deringThreshold= 20;
|
||||
|
||||
|
@ -2789,7 +2789,7 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int
|
||||
uint64_t * const yHistogram= c.yHistogram;
|
||||
uint8_t * const tempSrc= c.tempSrc;
|
||||
uint8_t * const tempDst= c.tempDst;
|
||||
const int mbWidth= isColor ? (width+7)>>3 : (width+15)>>4;
|
||||
//const int mbWidth= isColor ? (width+7)>>3 : (width+15)>>4;
|
||||
|
||||
#ifdef HAVE_MMX
|
||||
for(i=0; i<57; i++){
|
||||
|
@ -904,8 +904,9 @@ int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s);
|
||||
int ff_h263_resync(MpegEncContext *s);
|
||||
int ff_h263_get_gob_height(MpegEncContext *s);
|
||||
int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my);
|
||||
inline int ff_h263_round_chroma(int x);
|
||||
int ff_h263_round_chroma(int x);
|
||||
void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code);
|
||||
int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
|
||||
|
||||
|
||||
/* rv10.c */
|
||||
|
@ -656,21 +656,6 @@ void msmpeg4_encode_mb(MpegEncContext * s,
|
||||
|
||||
#endif //CONFIG_ENCODERS
|
||||
|
||||
/* old ffmpeg msmpeg4v3 mode */
|
||||
static void ff_old_msmpeg4_dc_scale(MpegEncContext * s)
|
||||
{
|
||||
if (s->qscale < 5){
|
||||
s->y_dc_scale = 8;
|
||||
s->c_dc_scale = 8;
|
||||
}else if (s->qscale < 9){
|
||||
s->y_dc_scale = 2 * s->qscale;
|
||||
s->c_dc_scale = (s->qscale + 13)>>1;
|
||||
}else{
|
||||
s->y_dc_scale = s->qscale + 8;
|
||||
s->c_dc_scale = (s->qscale + 13)>>1;
|
||||
}
|
||||
}
|
||||
|
||||
static inline int msmpeg4v1_pred_dc(MpegEncContext * s, int n,
|
||||
int32_t **dc_val_ptr)
|
||||
{
|
||||
|
@ -528,15 +528,9 @@ static int rv10_decode_packet(AVCodecContext *avctx,
|
||||
uint8_t *buf, int buf_size)
|
||||
{
|
||||
MpegEncContext *s = avctx->priv_data;
|
||||
int i, mb_count, mb_pos, left;
|
||||
int mb_count, mb_pos, left;
|
||||
|
||||
init_get_bits(&s->gb, buf, buf_size*8);
|
||||
#if 0
|
||||
for(i=0; i<buf_size*8 && i<200; i++)
|
||||
printf("%d", get_bits1(&s->gb));
|
||||
printf("\n");
|
||||
return 0;
|
||||
#endif
|
||||
if(s->codec_id ==CODEC_ID_RV10)
|
||||
mb_count = rv10_decode_picture_header(s);
|
||||
else
|
||||
|
@ -2056,7 +2056,7 @@ static void render_fragments(Vp3DecodeContext *s,
|
||||
unsigned char *last_plane;
|
||||
unsigned char *golden_plane;
|
||||
int stride;
|
||||
int motion_x, motion_y;
|
||||
int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef;
|
||||
int upper_motion_limit, lower_motion_limit;
|
||||
int motion_halfpel_index;
|
||||
uint8_t *motion_source;
|
||||
|
@ -479,9 +479,6 @@ s->picture_number++; //FIXME ?
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ff_wmv2_decode_init(MpegEncContext *s){
|
||||
}
|
||||
|
||||
static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr){
|
||||
MpegEncContext * const s= &w->s;
|
||||
int ret;
|
||||
|
Loading…
Reference in New Issue
Block a user