dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Minor video fixes 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7866 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2006-01-08 04:30:10 +00:00
parent 1af231176b
commit 85d2c9f8c9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
file.c
View File

@ -184,8 +184,6 @@ int ast_format_unregister(const char *name)
int ast_stopstream(struct ast_channel *tmp)
{
/* Stop a running stream if there is one */
if (tmp->vstream)
ast_closestream(tmp->vstream);
if (tmp->stream) {
ast_closestream(tmp->stream);
if (tmp->oldwriteformat && ast_set_write_format(tmp, tmp->oldwriteformat))
@ -730,6 +728,10 @@ int ast_closestream(struct ast_filestream *f)
f->realfilename = NULL;
}
f->fmt->close(f);
if (f->vfs) {
ast_closestream(f->vfs);
f->vfs = NULL;
}
return 0;
}

2
formats/format_h264.c
View File

@ -164,7 +164,7 @@ static struct ast_frame *h264_read(struct ast_filestream *s, int *whennext)
}
if ((res = fread(s->h264, 1, len, s->f)) != len) {
if (res)
ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
ast_log(LOG_WARNING, "Short read (%d of %d) (%s)!\n", res, len, strerror(errno));
return NULL;
}
s->fr.samples = s->lastts;