[asterisk-commits] trunk - r7866 in /trunk: file.c formats/format_h264.c

[asterisk-commits at lists.digium.com]

Author: markster
Date: Sat Jan  7 22:30:10 2006
New Revision: 7866

URL: http://svn.digium.com/view/asterisk?rev=7866&view=rev
Log:
Minor video fixes

Modified:
    trunk/file.c
    trunk/formats/format_h264.c

Modified: trunk/file.c
URL: http://svn.digium.com/view/asterisk/trunk/file.c?rev=7866&r1=7865&r2=7866&view=diff
==============================================================================
--- trunk/file.c (original)
+++ trunk/file.c Sat Jan  7 22:30:10 2006
@@ -184,8 +184,6 @@
 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 @@
 		f->realfilename = NULL;
 	}
 	f->fmt->close(f);
+	if (f->vfs) {
+		ast_closestream(f->vfs);
+		f->vfs = NULL;
+	}
 	return 0;
 }
 

Modified: trunk/formats/format_h264.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_h264.c?rev=7866&r1=7865&r2=7866&view=diff
==============================================================================
--- trunk/formats/format_h264.c (original)
+++ trunk/formats/format_h264.c Sat Jan  7 22:30:10 2006
@@ -164,7 +164,7 @@
 	}
 	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;