[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54118] trunk/blender/source/blender/avi/ intern/avi.c: remove redundant temp pointer assignment in AVI_write_frame.

Campbell Barton ideasman42 at gmail.com
Sun Jan 27 13:03:24 CET 2013


Revision: 54118
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54118
Author:   campbellbarton
Date:     2013-01-27 12:03:20 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
remove redundant temp pointer assignment in AVI_write_frame.

Modified Paths:
--------------
    trunk/blender/source/blender/avi/intern/avi.c

Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c	2013-01-27 11:20:50 UTC (rev 54117)
+++ trunk/blender/source/blender/avi/intern/avi.c	2013-01-27 12:03:20 UTC (rev 54118)
@@ -950,7 +950,6 @@
 {
 	AviList list;
 	AviChunk chunk;
-	AviIndexEntry *temp;
 	va_list ap;
 	int stream;
 	int64_t rec_off;
@@ -965,15 +964,7 @@
 
 	if (frame_num + 1 > movie->index_entries) {
 		const size_t entry_size = (movie->header->Streams + 1) * sizeof(AviIndexEntry);
-
-		if (movie->entries != NULL) {
-			temp = (AviIndexEntry *)MEM_recallocN(movie->entries, (frame_num + 1) * entry_size);
-		}
-		else {
-			temp = (AviIndexEntry *) MEM_callocN((frame_num + 1) * entry_size, "newidxentry");
-		}
-
-		movie->entries = temp;
+		movie->entries = (AviIndexEntry *)MEM_recallocN(movie->entries, (frame_num + 1) * entry_size);
 		movie->index_entries = frame_num + 1;
 	}
 




More information about the Bf-blender-cvs mailing list