diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 18:18:40 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 18:48:42 +0300 |
| commit | 6947b0c42e0649f0c8355442d1732d642e467902 (patch) | |
| tree | bffb2d72049108372cbe46273998f3790dc860f0 /libavformat/mxg.c | |
| parent | 27293b840ccae95ddb1f4d8af519e7962b0e373d (diff) | |
| parent | c76374c6db5f486672f9df223f43e4892bd655c9 (diff) | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxg.c')
| -rw-r--r-- | libavformat/mxg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxg.c b/libavformat/mxg.c index 81ffec6971..e884311bad 100644 --- a/libavformat/mxg.c +++ b/libavformat/mxg.c @@ -132,7 +132,7 @@ static int mxg_read_packet(AVFormatContext *s, AVPacket *pkt) uint8_t *startmarker_ptr, *end, *search_end, marker; MXGContext *mxg = s->priv_data; - while (!url_feof(s->pb) && !url_ferror(s->pb)){ + while (!url_feof(s->pb) && !s->pb->error){ if (mxg->cache_size <= OVERREAD_SIZE) { /* update internal buffer */ ret = mxg_update_cache(s, DEFAULT_PACKET_SIZE + OVERREAD_SIZE); |