diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 16:18:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 16:48:42 +0100 |
| commit | 6947b0c42e0649f0c8355442d1732d642e467902 (patch) | |
| tree | bffb2d72049108372cbe46273998f3790dc860f0 /libavformat/wtv.c | |
| parent | 27293b840ccae95ddb1f4d8af519e7962b0e373d (diff) | |
| parent | c76374c6db5f486672f9df223f43e4892bd655c9 (diff) | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wtv.c')
| -rw-r--r-- | libavformat/wtv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/wtv.c b/libavformat/wtv.c index ade4a42e1b..0a362dd9da 100644 --- a/libavformat/wtv.c +++ b/libavformat/wtv.c @@ -77,7 +77,7 @@ static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size) AVIOContext *pb = wf->pb_filesystem; int nread = 0; - if (wf->error || url_ferror(pb)) + if (wf->error || pb->error) return -1; if (wf->position >= wf->length || url_feof(pb)) return 0; |