comparison flvdec.c @ 4643:d148dbaebaca libavformat

Replace two 'return AVERROR(EAGAIN);' by continue. The latter are nicer and the EAGAIN were just added as example not because they made sense.
author michael
date Tue, 03 Mar 2009 20:24:17 +0000
parents ee5d7f52e4bc
children 063522a177cc
comparison
equal deleted inserted replaced
4642:60d5f0997351 4643:d148dbaebaca
346 flv_read_metabody(s, next); 346 flv_read_metabody(s, next);
347 else /* skip packet */ 347 else /* skip packet */
348 av_log(s, AV_LOG_ERROR, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags); 348 av_log(s, AV_LOG_ERROR, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags);
349 skip: 349 skip:
350 url_fseek(s->pb, next, SEEK_SET); 350 url_fseek(s->pb, next, SEEK_SET);
351 return AVERROR(EAGAIN); 351 continue;
352 } 352 }
353 353
354 /* skip empty data packets */ 354 /* skip empty data packets */
355 if (!size) 355 if (!size)
356 continue; 356 continue;
370 if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio)) 370 if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio))
371 ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio)) 371 ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio))
372 || st->discard >= AVDISCARD_ALL 372 || st->discard >= AVDISCARD_ALL
373 ){ 373 ){
374 url_fseek(s->pb, next, SEEK_SET); 374 url_fseek(s->pb, next, SEEK_SET);
375 return AVERROR(EAGAIN); 375 continue;
376 } 376 }
377 if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) 377 if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)
378 av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME); 378 av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME);
379 break; 379 break;
380 } 380 }