This should fix a regression.
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18624
9553f0bf-9b14-0410-a0b8-
cfaf0461ba5b
int err, i, ret, video_index, audio_index, subtitle_index;
AVPacket pkt1, *pkt = &pkt1;
AVFormatParameters params, *ap = ¶ms;
int err, i, ret, video_index, audio_index, subtitle_index;
AVPacket pkt1, *pkt = &pkt1;
AVFormatParameters params, *ap = ¶ms;
video_index = -1;
audio_index = -1;
video_index = -1;
audio_index = -1;
SDL_Delay(10);
continue;
}
SDL_Delay(10);
continue;
}
+ if(url_feof(ic->pb) || eof) {
av_init_packet(pkt);
pkt->data=NULL;
pkt->size=0;
av_init_packet(pkt);
pkt->data=NULL;
pkt->size=0;
}
ret = av_read_frame(ic, pkt);
if (ret < 0) {
}
ret = av_read_frame(ic, pkt);
if (ret < 0) {
- if (ret != AVERROR_EOF && url_ferror(ic->pb) == 0) {
- SDL_Delay(100); /* wait for user event */
- continue;
- } else
+ if (ret == AVERROR_EOF)
+ eof=1;
+ if (url_ferror(ic->pb))
+ SDL_Delay(100); /* wait for user event */
+ continue;
}
if (pkt->stream_index == is->audio_stream) {
packet_queue_put(&is->audioq, pkt);
}
if (pkt->stream_index == is->audio_stream) {
packet_queue_put(&is->audioq, pkt);