RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make sure that video frames are flushed at EOF. 

This should fix a regression.

Originally committed as revision 18624 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2009-04-19 20:24:44 +00:00
parent 120b4557f3
commit 75bb7b0add
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ffplay.c
View File

@ -1919,6 +1919,7 @@ static int decode_thread(void *arg)
int err, i, ret, video_index, audio_index, subtitle_index; int err, i, ret, video_index, audio_index, subtitle_index;
AVPacket pkt1, *pkt = &pkt1; AVPacket pkt1, *pkt = &pkt1;
AVFormatParameters params, *ap = &params; AVFormatParameters params, *ap = &params;
int eof=0;
video_index = -1; video_index = -1;
audio_index = -1; audio_index = -1;
@ -2072,7 +2073,7 @@ static int decode_thread(void *arg)
SDL_Delay(10); SDL_Delay(10);
continue; continue;
} }
if(url_feof(ic->pb)) { if(url_feof(ic->pb) || eof) {
av_init_packet(pkt); av_init_packet(pkt);
pkt->data=NULL; pkt->data=NULL;
pkt->size=0; pkt->size=0;
@ -2082,11 +2083,12 @@ static int decode_thread(void *arg)
} }
ret = av_read_frame(ic, pkt); ret = av_read_frame(ic, pkt);
if (ret < 0) { if (ret < 0) {
if (ret != AVERROR_EOF && url_ferror(ic->pb) == 0) { if (ret == AVERROR_EOF)
SDL_Delay(100); /* wait for user event */ eof=1;
continue; if (url_ferror(ic->pb))
} else
break; break;
SDL_Delay(100); /* wait for user event */
continue;
} }
if (pkt->stream_index == is->audio_stream) { if (pkt->stream_index == is->audio_stream) {
packet_queue_put(&is->audioq, pkt); packet_queue_put(&is->audioq, pkt);