Minor video fixes
authorMark Spencer <markster@digium.com>
Sun, 8 Jan 2006 04:30:10 +0000 (04:30 +0000)
committerMark Spencer <markster@digium.com>
Sun, 8 Jan 2006 04:30:10 +0000 (04:30 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7866 65c4cc65-6c06-0410-ace0-fbb531ad65f3

file.c
formats/format_h264.c

diff --git a/file.c b/file.c
index bce283b..a1ef759 100644 (file)
--- a/file.c
+++ b/file.c
@@ -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;
 }
 
index e132e0f..662320f 100644 (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;