Commit 59ca3955 authored by Ami Fischman's avatar Ami Fischman Committed by Ronald S. Bultje

av_find_stream_info: simplify EAGAIN handling.

Signed-off-by: 's avatarRonald S. Bultje <rsbultje@gmail.com>
parent 98add74e
...@@ -2306,7 +2306,10 @@ int av_find_stream_info(AVFormatContext *ic) ...@@ -2306,7 +2306,10 @@ int av_find_stream_info(AVFormatContext *ic)
/* NOTE: a new stream can be added there if no header in file /* NOTE: a new stream can be added there if no header in file
(AVFMTCTX_NOHEADER) */ (AVFMTCTX_NOHEADER) */
ret = av_read_frame_internal(ic, &pkt1); ret = av_read_frame_internal(ic, &pkt1);
if (ret < 0 && ret != AVERROR(EAGAIN)) { if (ret == AVERROR(EAGAIN))
continue;
if (ret < 0) {
/* EOF or error */ /* EOF or error */
ret = -1; /* we could not have all the codec parameters before EOF */ ret = -1; /* we could not have all the codec parameters before EOF */
for(i=0;i<ic->nb_streams;i++) { for(i=0;i<ic->nb_streams;i++) {
...@@ -2322,9 +2325,6 @@ int av_find_stream_info(AVFormatContext *ic) ...@@ -2322,9 +2325,6 @@ int av_find_stream_info(AVFormatContext *ic)
break; break;
} }
if (ret == AVERROR(EAGAIN))
continue;
pkt= add_to_pktbuf(&ic->packet_buffer, &pkt1, &ic->packet_buffer_end); pkt= add_to_pktbuf(&ic->packet_buffer, &pkt1, &ic->packet_buffer_end);
if ((ret = av_dup_packet(pkt)) < 0) if ((ret = av_dup_packet(pkt)) < 0)
goto find_stream_info_err; goto find_stream_info_err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment