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 /ffplay.c | |
parent | 27293b840ccae95ddb1f4d8af519e7962b0e373d (diff) | |
parent | c76374c6db5f486672f9df223f43e4892bd655c9 (diff) | |
download | ffmpeg-6947b0c42e0649f0c8355442d1732d642e467902.tar.gz |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
-rw-r--r-- | ffplay.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2575,7 +2575,7 @@ static int decode_thread(void *arg) if (ret < 0) { if (ret == AVERROR_EOF || url_feof(ic->pb)) eof=1; - if (url_ferror(ic->pb)) + if (ic->pb->error) break; SDL_Delay(100); /* wait for user event */ continue; |