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

In av_close_input_stream(), flush the packet queue before to actually 

close the stream.

This way the flushed packets can still reference the still unclosed
format context.

In particular this fixes a spurious error issued when closing the
video4linux2 buffer in mmap_release_buffer(), which tries to access
the file descriptor of an already closed file.

Originally committed as revision 26237 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2011-01-06 01:01:14 +00:00
parent 29db7c3af4
commit 81bd411965
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/utils.c
View File

@ -2544,6 +2544,7 @@ void av_close_input_stream(AVFormatContext *s)
int i; int i;
AVStream *st; AVStream *st;
flush_packet_queue(s);
if (s->iformat->read_close) if (s->iformat->read_close)
s->iformat->read_close(s); s->iformat->read_close(s);
for(i=0;i<s->nb_streams;i++) { for(i=0;i<s->nb_streams;i++) {
@ -2575,7 +2576,6 @@ void av_close_input_stream(AVFormatContext *s)
av_freep(&s->programs[i]); av_freep(&s->programs[i]);
} }
av_freep(&s->programs); av_freep(&s->programs);
flush_packet_queue(s);
av_freep(&s->priv_data); av_freep(&s->priv_data);
while(s->nb_chapters--) { while(s->nb_chapters--) {
#if FF_API_OLD_METADATA #if FF_API_OLD_METADATA