Mercurial > libavcodec.hg

comparison mjpeg.c @ 1455:c4539ef4d8cb libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed warnings
author bellard
date Tue, 09 Sep 2003 22:59:16 +0000
parents e68194195c92
children 010f76d07a27
comparison
equal deleted inserted replaced
1454:8b6e5cca1d37 1455:c4539ef4d8cb
287 case 2: ret= top; break;\ 287 case 2: ret= top; break;\
288 case 3: ret= topleft; break;\ 288 case 3: ret= topleft; break;\
289 case 4: ret= left + top - topleft; break;\ 289 case 4: ret= left + top - topleft; break;\
290 case 5: ret= left + ((top - topleft)>>1); break;\ 290 case 5: ret= left + ((top - topleft)>>1); break;\
291 case 6: ret= top + ((left - topleft)>>1); break;\ 291 case 6: ret= top + ((left - topleft)>>1); break;\
292 default:\
292 case 7: ret= (left + top)>>1; break;\ 293 case 7: ret= (left + top)>>1; break;\
293 } 294 }
294 295
295 #ifdef CONFIG_ENCODERS 296 #ifdef CONFIG_ENCODERS
296 static inline void put_marker(PutBitContext *p, int code) 297 static inline void put_marker(PutBitContext *p, int code)
1362 return 0; 1363 return 0;
1363 } 1364 }
1364 1365
1365 static int mjpeg_decode_sos(MJpegDecodeContext *s) 1366 static int mjpeg_decode_sos(MJpegDecodeContext *s)
1366 { 1367 {
1367 int len, nb_components, i, h, v, predictor, point_transform, ilv; 1368 int len, nb_components, i, h, v, predictor, point_transform;
1368 int vmax, hmax, index, id; 1369 int vmax, hmax, index, id;
1369 const int block_size= s->lossless ? 1 : 8; 1370 const int block_size= s->lossless ? 1 : 8;
1370 1371
1371 /* XXX: verify len field validity */ 1372 /* XXX: verify len field validity */
1372 len = get_bits(&s->gb, 16); 1373 len = get_bits(&s->gb, 16);