From: Mark Spencer <markster@digium.com>
Date: Sun, 8 Jan 2006 04:30:10 +0000 (+0000)
Subject: Minor video fixes
X-Git-Tag: 1.4.0-beta1~3034
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=940c49390cd5f097f8c761d89132c533758fa0c8;p=thirdparty%2Fasterisk.git

Minor video fixes


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/file.c b/file.c
index bce283b837..a1ef759a32 100644
--- 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;
 }
 
diff --git a/formats/format_h264.c b/formats/format_h264.c
index e132e0fe0e..662320fb6a 100644
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -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;