Commit 1d0036b0 authored by Ronald S. Bultje's avatar Ronald S. Bultje

Change another AVERROR(EIO) inot AVERROR_EOF, because it really signals EOF,

not a stream error. This also fixes an infinite loop on EOS during ASF file
playback, and Michael claims he "likes the patch" (ref: [PATCH] RTSP-MS
15/15: move packet_time_start zero value assignment in asf.c" mailinglist
tread).

Originally committed as revision 18552 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 72619760
...@@ -715,7 +715,7 @@ int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt) ...@@ -715,7 +715,7 @@ int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt)
asf->packet_pos= url_ftell(pb); asf->packet_pos= url_ftell(pb);
if (asf->data_object_size != (uint64_t)-1 && if (asf->data_object_size != (uint64_t)-1 &&
(asf->packet_pos - asf->data_object_offset >= asf->data_object_size)) (asf->packet_pos - asf->data_object_offset >= asf->data_object_size))
return AVERROR(EIO); /* Do not exceed the size of the data object */ return AVERROR_EOF; /* Do not exceed the size of the data object */
return 1; return 1;
} }
if (asf->packet_time_start == 0) { if (asf->packet_time_start == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment