Mercurial > libavformat.hg

comparison rmdec.c @ 5444:d424e2ef1b44 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of useless casts.
author michael
date Sun, 13 Dec 2009 17:54:09 +0000
parents e0b458b3d1ae
children 5ebeb34e4456
comparison
equal deleted inserted replaced
5443:e0b458b3d1ae 5444:d424e2ef1b44
325 return ret; 325 return ret;
326 326
327 // av_log(s, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2); 327 // av_log(s, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);
328 st->codec->time_base.den = fps * st->codec->time_base.num; 328 st->codec->time_base.den = fps * st->codec->time_base.num;
329 //XXX: do we really need that? 329 //XXX: do we really need that?
330 switch(((uint8_t*)st->codec->extradata)[4]>>4){ 330 switch(st->codec->extradata[4]>>4){
331 case 1: st->codec->codec_id = CODEC_ID_RV10; break; 331 case 1: st->codec->codec_id = CODEC_ID_RV10; break;
332 case 2: st->codec->codec_id = CODEC_ID_RV20; break; 332 case 2: st->codec->codec_id = CODEC_ID_RV20; break;
333 case 3: st->codec->codec_id = CODEC_ID_RV30; break; 333 case 3: st->codec->codec_id = CODEC_ID_RV30; break;
334 case 4: st->codec->codec_id = CODEC_ID_RV40; break; 334 case 4: st->codec->codec_id = CODEC_ID_RV40; break;
335 default: 335 default:
336 av_log(st->codec, AV_LOG_ERROR, "extra:%02X %02X %02X %02X %02X\n", ((uint8_t*)st->codec->extradata)[0], ((uint8_t*)st->codec->extradata)[1], ((uint8_t*)st->codec->extradata)[2], ((uint8_t*)st->codec->extradata)[3], ((uint8_t*)st->codec->extradata)[4]); 336 av_log(st->codec, AV_LOG_ERROR, "extra:%02X %02X %02X %02X %02X\n", st->codec->extradata[0], st->codec->extradata[1], st->codec->extradata[2], st->codec->extradata[3], st->codec->extradata[4]);
337 goto fail1; 337 goto fail1;
338 } 338 }
339 } 339 }
340 340
341 skip: 341 skip: