Mercurial > libavcodec.hg

comparison mjpegdec.c @ 8596:68e959302527 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_ and remove all ENABLE_ definitions.
author aurel
date Wed, 14 Jan 2009 17:19:17 +0000
parents 800444234375
children b20c590170cc
comparison
equal deleted inserted replaced
8595:2f476018b4ac 8596:68e959302527
975 /* mjpeg-b can have padding bytes between sos and image data, skip them */ 975 /* mjpeg-b can have padding bytes between sos and image data, skip them */
976 for (i = s->mjpb_skiptosod; i > 0; i--) 976 for (i = s->mjpb_skiptosod; i > 0; i--)
977 skip_bits(&s->gb, 8); 977 skip_bits(&s->gb, 8);
978 978
979 if(s->lossless){ 979 if(s->lossless){
980 if(ENABLE_JPEGLS_DECODER && s->ls){ 980 if(CONFIG_JPEGLS_DECODER && s->ls){
981 // for(){ 981 // for(){
982 // reset_ls_coding_parameters(s, 0); 982 // reset_ls_coding_parameters(s, 0);
983 983
984 if(ff_jpegls_decode_picture(s, predictor, point_transform, ilv) < 0) 984 if(ff_jpegls_decode_picture(s, predictor, point_transform, ilv) < 0)
985 return -1; 985 return -1;
1416 s->progressive=0; 1416 s->progressive=0;
1417 if (ff_mjpeg_decode_sof(s) < 0) 1417 if (ff_mjpeg_decode_sof(s) < 0)
1418 return -1; 1418 return -1;
1419 break; 1419 break;
1420 case LSE: 1420 case LSE:
1421 if (!ENABLE_JPEGLS_DECODER || ff_jpegls_decode_lse(s) < 0) 1421 if (!CONFIG_JPEGLS_DECODER || ff_jpegls_decode_lse(s) < 0)
1422 return -1; 1422 return -1;
1423 break; 1423 break;
1424 case EOI: 1424 case EOI:
1425 s->cur_scan = 0; 1425 s->cur_scan = 0;
1426 if ((s->buggy_avid && !s->interlaced) || s->restart_interval) 1426 if ((s->buggy_avid && !s->interlaced) || s->restart_interval)