aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-26 03:37:01 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-26 03:37:01 +0000
commitba26712b5c37390d68d1419176394a6089141f1d (patch)
tree558a3696467da76b6d69772b8ae997fb28c5002a
parent87b6ea8458d11952695086e8c43d32d5b7bc0883 (diff)
downloadffmpeg-ba26712b5c37390d68d1419176394a6089141f1d.tar.gz
reenable test, data is available in this case
Originally committed as revision 13412 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/ffm.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libavformat/ffm.c b/libavformat/ffm.c
index 5c9dd7830f..45ac817c6b 100644
--- a/libavformat/ffm.c
+++ b/libavformat/ffm.c
@@ -296,11 +296,8 @@ static int ffm_is_avail_data(AVFormatContext *s, int size)
int len;
len = ffm->packet_end - ffm->packet_ptr;
- if (!ffm_nopts) {
- /* XXX: I don't understand this test, so I disabled it for testing */
- if (size <= len)
- return 1;
- }
+ if (size <= len)
+ return 1;
pos = url_ftell(s->pb);
if (pos == ffm->write_index) {
/* exactly at the end of stream */