kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor video fixes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2006-01-08 04:30:10 +00:00
parent 353e5f1dc9
commit 940c49390c
2 changed files with 5 additions and 3 deletions
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) int ast_stopstream(struct ast_channel *tmp)
{ {
/* Stop a running stream if there is one */ /* Stop a running stream if there is one */
if (tmp->vstream)
ast_closestream(tmp->vstream);
if (tmp->stream) { if (tmp->stream) {
ast_closestream(tmp->stream); ast_closestream(tmp->stream);
if (tmp->oldwriteformat && ast_set_write_format(tmp, tmp->oldwriteformat)) 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->realfilename = NULL;
} }
f->fmt->close(f); f->fmt->close(f);
if (f->vfs) {
ast_closestream(f->vfs);
f->vfs = NULL;
}
return 0; 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 = fread(s->h264, 1, len, s->f)) != len) {
if (res) 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; return NULL;
} }
s->fr.samples = s->lastts; s->fr.samples = s->lastts;