Module: libav Branch: master Commit: 59ca3955fbe13401bf49d456562264267d9991fe
Author: Ami Fischman <[email protected]> Committer: Ronald S. Bultje <[email protected]> Date: Wed Jun 29 13:50:21 2011 -0700 av_find_stream_info: simplify EAGAIN handling. Signed-off-by: Ronald S. Bultje <[email protected]> --- libavformat/utils.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 7370c60..b12f785 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2306,7 +2306,10 @@ int av_find_stream_info(AVFormatContext *ic) /* NOTE: a new stream can be added there if no header in file (AVFMTCTX_NOHEADER) */ ret = av_read_frame_internal(ic, &pkt1); - if (ret < 0 && ret != AVERROR(EAGAIN)) { + if (ret == AVERROR(EAGAIN)) + continue; + + if (ret < 0) { /* EOF or error */ ret = -1; /* we could not have all the codec parameters before EOF */ for(i=0;i<ic->nb_streams;i++) { @@ -2322,9 +2325,6 @@ int av_find_stream_info(AVFormatContext *ic) break; } - if (ret == AVERROR(EAGAIN)) - continue; - pkt= add_to_pktbuf(&ic->packet_buffer, &pkt1, &ic->packet_buffer_end); if ((ret = av_dup_packet(pkt)) < 0) goto find_stream_info_err; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
