diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-02 20:32:24 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-02 20:32:24 +0000 |
| commit | 07679e680c01a6a96b66ed885cc4c8ddd906b124 (patch) | |
| tree | 84f108ef84de38754bd2ca3b9959eec28b290d7a /libavformat/utils.c | |
| parent | da835cc8a38c54c09b4fe82b73a32781f57c2d4c (diff) | |
| download | ffmpeg-07679e680c01a6a96b66ed885cc4c8ddd906b124.tar.gz | |
revert r16717, r16718, r16719, EAGAIN handling, this causes FFserver to hang
Originally committed as revision 17737 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 900bd206e1..0ffe96a00b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1515,10 +1515,7 @@ static int av_seek_frame_generic(AVFormatContext *s, return ret; } for(i=0;; i++) { - int ret; - do{ - ret = av_read_frame(s, &pkt); - }while(ret == AVERROR(EAGAIN)); + int ret = av_read_frame(s, &pkt); if(ret<0) break; av_free_packet(&pkt); @@ -1741,9 +1738,7 @@ static void av_estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset if (i == ic->nb_streams) break; - do{ - ret = av_read_packet(ic, pkt); - }while(ret == AVERROR(EAGAIN)); + ret = av_read_packet(ic, pkt); if (ret != 0) break; read_size += pkt->size; @@ -1768,9 +1763,7 @@ static void av_estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset if (read_size >= DURATION_MAX_READ_SIZE) break; - do{ - ret = av_read_packet(ic, pkt); - }while(ret == AVERROR(EAGAIN)); + ret = av_read_packet(ic, pkt); if (ret != 0) break; read_size += pkt->size; @@ -2079,8 +2072,6 @@ 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 == AVERROR(EAGAIN)) - continue; if (ret < 0) { /* EOF or error */ ret = -1; /* we could not have all the codec parameters before EOF */ |