comparison nutdec.c @ 3013:2478b7222c56 libavformat

Remove old workaround in nutdec.c for libnut bug
author ods15
date Mon, 04 Feb 2008 10:30:38 +0000
parents 2214e8b1cb4d
children f5de7bad2bb9
comparison
equal deleted inserted replaced
3012:2214e8b1cb4d 3013:2478b7222c56
334 return -1; 334 return -1;
335 } 335 }
336 ff_get_v(bc); /* csp type */ 336 ff_get_v(bc); /* csp type */
337 }else if (st->codec->codec_type == CODEC_TYPE_AUDIO){ 337 }else if (st->codec->codec_type == CODEC_TYPE_AUDIO){
338 GET_V(st->codec->sample_rate , tmp > 0) 338 GET_V(st->codec->sample_rate , tmp > 0)
339 tmp= ff_get_v(bc); // samplerate_den 339 ff_get_v(bc); // samplerate_den
340 if(tmp > st->codec->sample_rate){
341 av_log(s, AV_LOG_ERROR, "Bleh, libnut muxed this ;)\n");
342 st->codec->sample_rate= tmp;
343 }
344 GET_V(st->codec->channels, tmp > 0) 340 GET_V(st->codec->channels, tmp > 0)
345 } 341 }
346 if(skip_reserved(bc, end) || get_checksum(bc)){ 342 if(skip_reserved(bc, end) || get_checksum(bc)){
347 av_log(s, AV_LOG_ERROR, "stream header %d checksum mismatch\n", stream_id); 343 av_log(s, AV_LOG_ERROR, "stream header %d checksum mismatch\n", stream_id);
348 return -1; 344 return -1;