comparison flvdec.c @ 4509:8ec95cf6deb9 libavformat

Add a context to av_log() calls.
author benoit
date Mon, 16 Feb 2009 16:09:34 +0000
parents 932720e90fc5
children 241a66d33f49
comparison
equal deleted inserted replaced
4508:99c3000c9482 4509:8ec95cf6deb9
358 st = s->streams[i]; 358 st = s->streams[i];
359 if (st->id == is_audio) 359 if (st->id == is_audio)
360 break; 360 break;
361 } 361 }
362 if(i == s->nb_streams){ 362 if(i == s->nb_streams){
363 av_log(NULL, AV_LOG_ERROR, "invalid stream\n"); 363 av_log(s, AV_LOG_ERROR, "invalid stream\n");
364 st= create_stream(s, is_audio); 364 st= create_stream(s, is_audio);
365 s->ctx_flags &= ~AVFMTCTX_NOHEADER; 365 s->ctx_flags &= ~AVFMTCTX_NOHEADER;
366 } 366 }
367 // av_log(NULL, AV_LOG_DEBUG, "%d %X %d \n", is_audio, flags, st->discard); 367 // av_log(s, AV_LOG_DEBUG, "%d %X %d \n", is_audio, flags, st->discard);
368 if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio)) 368 if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio))
369 ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio)) 369 ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio))
370 || st->discard >= AVDISCARD_ALL 370 || st->discard >= AVDISCARD_ALL
371 ){ 371 ){
372 url_fseek(s->pb, next, SEEK_SET); 372 url_fseek(s->pb, next, SEEK_SET);