Revision: 27655
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27655
Author: campbellbarton
Date: 2010-03-22 10:30:00 +0100 (Mon, 22 Mar 2010)
Log Message:
-----------
spaces -> tabs, (4 spaces == 1 tab, only for white space preceding text)
Modified Paths:
--------------
trunk/blender/source/blender/avi/AVI_avi.h
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/avi/intern/codecs.c
trunk/blender/source/blender/avi/intern/mjpeg.c
trunk/blender/source/blender/avi/intern/options.c
trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
trunk/blender/source/blender/blenkernel/BKE_bmesh.h
trunk/blender/source/blender/blenkernel/BKE_booleanops.h
trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h
trunk/blender/source/blender/blenkernel/BKE_context.h
trunk/blender/source/blender/blenkernel/BKE_customdata.h
trunk/blender/source/blender/blenkernel/BKE_displist.h
trunk/blender/source/blender/blenkernel/BKE_idprop.h
trunk/blender/source/blender/blenkernel/BKE_lattice.h
trunk/blender/source/blender/blenkernel/BKE_modifier.h
trunk/blender/source/blender/blenkernel/BKE_paint.h
trunk/blender/source/blender/blenkernel/BKE_softbody.h
trunk/blender/source/blender/blenkernel/BKE_subsurf.h
trunk/blender/source/blender/blenkernel/intern/BME_Customdata.c
trunk/blender/source/blender/blenkernel/intern/BME_eulers.c
trunk/blender/source/blender/blenkernel/intern/BME_mesh.c
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/bmfont.c
trunk/blender/source/blender/blenkernel/intern/booleanops.c
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/bvhutils.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/blenkernel/intern/exotic.c
trunk/blender/source/blender/blenkernel/intern/fluidsim.c
trunk/blender/source/blender/blenkernel/intern/fmodifier.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/idprop.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/image_gen.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/sca.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/blenkernel/intern/world.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenkernel/intern/writeframeserver.c
trunk/blender/source/blender/blenlib/BLI_pbvh.h
trunk/blender/source/blender/blenlib/BLI_vfontdata.h
trunk/blender/source/blender/blenlib/intern/BLI_bfile.c
trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/blenlib/intern/BLI_linklist.c
trunk/blender/source/blender/blenlib/intern/boxpack2d.c
trunk/blender/source/blender/blenlib/intern/bpath.c
trunk/blender/source/blender/blenlib/intern/dynamiclist.c
trunk/blender/source/blender/blenlib/intern/edgehash.c
trunk/blender/source/blender/blenlib/intern/fnmatch.c
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/blenlib/intern/math_base.c
trunk/blender/source/blender/blenlib/intern/math_color.c
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenlib/intern/math_matrix.c
trunk/blender/source/blender/blenlib/intern/math_rotation.c
trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/blenlib/intern/scanfill.c
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/blenlib/intern/string.c
trunk/blender/source/blender/blenlib/intern/voxel.c
trunk/blender/source/blender/blenlib/intern/winstuff.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/animation/keyframes_edit.c
trunk/blender/source/blender/editors/animation/keyframes_general.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/curve/curve_intern.h
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/editors/include/ED_anim_api.h
trunk/blender/source/blender/editors/include/ED_numinput.h
trunk/blender/source/blender/editors/include/ED_sculpt.h
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/include/UI_resources.h
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh_lib.c
trunk/blender/source/blender/editors/mesh/editmesh_loop.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/metaball/mball_edit.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_lattice.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/screen/glutil.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/screen/screendump.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_action/space_action.c
trunk/blender/source/blender/editors/space_buttons/space_buttons.c
trunk/blender/source/blender/editors/space_console/console_ops.c
trunk/blender/source/blender/editors/space_console/console_report.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_file/fsmenu.h
trunk/blender/source/blender/editors/space_file/space_file.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_nla/space_nla.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/space_node/space_node.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_intern.h
trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/space_text/text_header.c
trunk/blender/source/blender/editors/space_text/text_intern.h
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/editors/space_view3d/drawarmature.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/transform/transform_constraints.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_ndofinput.c
trunk/blender/source/blender/editors/transform/transform_ops.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/editors/util/numinput.c
trunk/blender/source/blender/editors/util/undo.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.h
trunk/blender/source/blender/gpu/GPU_extensions.h
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.h
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/imbuf/intern/IMB_anim.h
trunk/blender/source/blender/imbuf/intern/IMB_imginfo.h
trunk/blender/source/blender/imbuf/intern/allocimbuf.c
trunk/blender/source/blender/imbuf/intern/anim.c
trunk/blender/source/blender/imbuf/intern/anim5.c
trunk/blender/source/blender/imbuf/intern/bmp.c
trunk/blender/source/blender/imbuf/intern/data.c
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.h
trunk/blender/source/blender/imbuf/intern/divers.c
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/md5.c
trunk/blender/source/blender/imbuf/intern/md5.h
trunk/blender/source/blender/imbuf/intern/png.c
trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
trunk/blender/source/blender/imbuf/intern/readimage.c
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/imbuf/intern/targa.c
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesdna/DNA_action_types.h
trunk/blender/source/blender/makesdna/DNA_camera_types.h
trunk/blender/source/blender/makesdna/DNA_cloth_types.h
trunk/blender/source/blender/makesdna/DNA_constraint_types.h
trunk/blender/source/blender/makesdna/DNA_lamp_types.h
trunk/blender/source/blender/makesdna/DNA_modifier_types.h
trunk/blender/source/blender/makesdna/DNA_object_force.h
trunk/blender/source/blender/makesdna/DNA_object_types.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesdna/DNA_sdna_types.h
trunk/blender/source/blender/makesdna/DNA_sensor_types.h
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/makesdna/DNA_texture_types.h
trunk/blender/source/blender/makesdna/DNA_vec_types.h
trunk/blender/source/blender/makesdna/DNA_view3d_types.h
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_brush.c
trunk/blender/source/blender/makesrna/intern/rna_color.c
trunk/blender/source/blender/makesrna/intern/rna_controller.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_key.c
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
trunk/blender/source/blender/makesrna/intern/rna_main.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_smoke.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
trunk/blender/source/blender/nodes/intern/CMP_util.c
trunk/blender/source/blender/nodes/intern/CMP_util.h
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
trunk/blender/source/blender/nodes/intern/TEX_util.c
trunk/blender/source/blender/python/BPY_extern.h
trunk/blender/source/blender/python/generic/Geometry.c
trunk/blender/source/blender/python/generic/Mathutils.c
trunk/blender/source/blender/python/generic/bgl.c
trunk/blender/source/blender/python/generic/bpy_internal_import.c
trunk/blender/source/blender/python/generic/euler.c
trunk/blender/source/blender/python/generic/matrix.c
trunk/blender/source/blender/python/generic/quat.c
trunk/blender/source/blender/python/generic/vector.c
trunk/blender/source/blender/python/intern/bpy.c
trunk/blender/source/blender/python/intern/bpy_array.c
trunk/blender/source/blender/python/intern/bpy_driver.c
trunk/blender/source/blender/python/intern/bpy_props.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/python/intern/bpy_util.h
trunk/blender/source/blender/quicktime/apple/quicktime_export.c
trunk/blender/source/blender/quicktime/apple/quicktime_import.c
trunk/blender/source/blender/readblenfile/test/test.c
trunk/blender/source/blender/render/intern/include/rayobject.h
trunk/blender/source/blender/render/intern/include/render_types.h
trunk/blender/source/blender/render/intern/include/sunsky.h
trunk/blender/source/blender/render/intern/include/zbuf.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/gammaCorrectionTables.c
trunk/blender/source/blender/render/intern/source/imagetexture.c
trunk/blender/source/blender/render/intern/source/initrender.c
trunk/blender/source/blender/render/intern/source/occlusion.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/pixelblending.c
trunk/blender/source/blender/render/intern/source/pixelshading.c
trunk/blender/source/blender/render/intern/source/pointdensity.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/render/intern/source/sss.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/render/intern/source/sunsky.c
trunk/blender/source/blender/render/intern/source/texture.c
trunk/blender/source/blender/render/intern/source/volumetric.c
trunk/blender/source/blender/render/intern/source/voxeldata.c
trunk/blender/source/blender/render/intern/source/zbuf.c
trunk/blender/source/blender/verify/intern/BLO_verify.c
trunk/blender/source/blender/windowmanager/intern/wm_apple.c
trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
trunk/blender/source/blender/windowmanager/intern/wm_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_gesture.c
trunk/blender/source/blender/windowmanager/intern/wm_jobs.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c
Modified: trunk/blender/source/blender/avi/AVI_avi.h
===================================================================
--- trunk/blender/source/blender/avi/AVI_avi.h 2010-03-22 08:49:12 UTC (rev
27654)
+++ trunk/blender/source/blender/avi/AVI_avi.h 2010-03-22 09:30:00 UTC (rev
27655)
@@ -175,7 +175,7 @@
} AviStreamRec;
typedef struct _AviMovie {
- FILE *fp;
+ FILE *fp;
int type;
#define AVI_MOVIE_READ 0
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2010-03-22 08:49:12 UTC
(rev 27654)
+++ trunk/blender/source/blender/avi/intern/avi.c 2010-03-22 09:30:00 UTC
(rev 27655)
@@ -197,8 +197,8 @@
return 0;
if (GET_FCC (fp) != FCC("RIFF") ||
- !GET_FCC (fp) ||
- GET_FCC (fp) != FCC("AVI ")) {
+ !GET_FCC (fp) ||
+ GET_FCC (fp) != FCC("AVI ")) {
ret = 0;
} else {
ret = 1;
@@ -228,19 +228,19 @@
return 0;
if (GET_FCC (movie.fp) != FCC("RIFF") ||
- !(movie.size = GET_FCC (movie.fp))) {
- fclose(movie.fp);
+ !(movie.size = GET_FCC (movie.fp))) {
+ fclose(movie.fp);
return 0;
}
movie.header = &header;
if (GET_FCC (movie.fp) != FCC("AVI ") ||
- GET_FCC (movie.fp) != FCC("LIST") ||
- !GET_FCC (movie.fp) ||
- GET_FCC (movie.fp) != FCC("hdrl") ||
- (movie.header->fcc = GET_FCC (movie.fp)) != FCC("avih") ||
- !(movie.header->size = GET_FCC (movie.fp))) {
+ GET_FCC (movie.fp) != FCC("LIST") ||
+ !GET_FCC (movie.fp) ||
+ GET_FCC (movie.fp) != FCC("hdrl") ||
+ (movie.header->fcc = GET_FCC (movie.fp)) != FCC("avih") ||
+ !(movie.header->size = GET_FCC (movie.fp))) {
DEBUG("bad initial header info\n");
fclose(movie.fp);
return 0;
@@ -274,10 +274,10 @@
for (temp=0; temp < movie.header->Streams; temp++) {
if (GET_FCC(movie.fp) != FCC("LIST") ||
- !GET_FCC (movie.fp) ||
- GET_FCC (movie.fp) != FCC ("strl") ||
- (movie.streams[temp].sh.fcc = GET_FCC (movie.fp)) != FCC
("strh") ||
- !(movie.streams[temp].sh.size = GET_FCC (movie.fp))) {
+ !GET_FCC (movie.fp) ||
+ GET_FCC (movie.fp) != FCC ("strl") ||
+ (movie.streams[temp].sh.fcc = GET_FCC (movie.fp)) !=
FCC ("strh") ||
+ !(movie.streams[temp].sh.size = GET_FCC (movie.fp))) {
DEBUG("bad stream header information\n");
MEM_freeN(movie.streams);
@@ -357,7 +357,7 @@
fcca = bi->Compression;
- if ( movie.streams[temp].format ==
+ if ( movie.streams[temp].format ==
AVI_FORMAT_AVI_RGB) {
if (fcca == FCC ("DIB ") ||
fcca == FCC ("RGB ") ||
@@ -386,7 +386,7 @@
MEM_freeN(movie.streams);
fclose(movie.fp);
- return 0;
+ return 0;
}
fseek(movie.fp, temp, SEEK_CUR);
}
@@ -417,17 +417,17 @@
return AVI_ERROR_OPEN;
if (GET_FCC (movie->fp) != FCC("RIFF") ||
- !(movie->size = GET_FCC (movie->fp)))
+ !(movie->size = GET_FCC (movie->fp)))
return AVI_ERROR_FORMAT;
movie->header = (AviMainHeader *) MEM_mallocN (sizeof (AviMainHeader),
"movieheader");
if (GET_FCC (movie->fp) != FCC("AVI ") ||
- GET_FCC (movie->fp) != FCC("LIST") ||
- !GET_FCC (movie->fp) ||
- GET_FCC (movie->fp) != FCC("hdrl") ||
- (movie->header->fcc = GET_FCC (movie->fp)) != FCC("avih") ||
- !(movie->header->size = GET_FCC (movie->fp))) {
+ GET_FCC (movie->fp) != FCC("LIST") ||
+ !GET_FCC (movie->fp) ||
+ GET_FCC (movie->fp) != FCC("hdrl") ||
+ (movie->header->fcc = GET_FCC (movie->fp)) != FCC("avih") ||
+ !(movie->header->size = GET_FCC (movie->fp))) {
DEBUG("bad initial header info\n");
return AVI_ERROR_FORMAT;
}
@@ -459,10 +459,10 @@
for (temp=0; temp < movie->header->Streams; temp++) {
if (GET_FCC(movie->fp) != FCC("LIST") ||
- !GET_FCC (movie->fp) ||
- GET_FCC (movie->fp) != FCC ("strl") ||
- (movie->streams[temp].sh.fcc = GET_FCC (movie->fp)) != FCC
("strh") ||
- !(movie->streams[temp].sh.size = GET_FCC (movie->fp))) {
+ !GET_FCC (movie->fp) ||
+ GET_FCC (movie->fp) != FCC ("strl") ||
+ (movie->streams[temp].sh.fcc = GET_FCC (movie->fp)) !=
FCC ("strh") ||
+ !(movie->streams[temp].sh.size = GET_FCC (movie->fp))) {
DEBUG("bad stream header information\n");
return AVI_ERROR_FORMAT;
}
@@ -535,7 +535,7 @@
fcca = bi->Compression;
- if ( movie->streams[temp].format ==
+ if (
movie->streams[temp].format ==
AVI_FORMAT_AVI_RGB) {
if (fcca == FCC ("DIB ") ||
fcca == FCC ("RGB ") ||
@@ -559,7 +559,7 @@
temp= GET_FCC (movie->fp);
if (temp<0 || ftell(movie->fp) > movie->size) {
DEBUG("incorrect size in header or error in
AVI\n");
- return AVI_ERROR_FORMAT;
+ return AVI_ERROR_FORMAT;
}
fseek(movie->fp, temp, SEEK_CUR);
}
@@ -584,7 +584,7 @@
}
if (ftell(movie->fp) > movie->size) {
DEBUG("incorrect size in header or error in AVI\n");
- return AVI_ERROR_FORMAT;
+ return AVI_ERROR_FORMAT;
}
}
@@ -727,9 +727,9 @@
movie->header->fcc = FCC("avih");
movie->header->size = 56;
movie->header->MicroSecPerFrame = 66667;
- movie->header->MaxBytesPerSec = 0;
- movie->header->PaddingGranularity = 0;
- movie->header->Flags = AVIF_HASINDEX | AVIF_MUSTUSEINDEX;
+ movie->header->MaxBytesPerSec = 0;
+ movie->header->PaddingGranularity = 0;
+ movie->header->Flags = AVIF_HASINDEX | AVIF_MUSTUSEINDEX;
movie->header->TotalFrames = 0;
movie->header->InitialFrames = 0;
movie->header->Streams = streams;
@@ -906,10 +906,10 @@
if (frame_num+1 > movie->index_entries) {
temp = (AviIndexEntry *) MEM_mallocN ((frame_num+1) *
- (movie->header->Streams+1) *
sizeof(AviIndexEntry),"newidxentry");
+ (movie->header->Streams+1) *
sizeof(AviIndexEntry),"newidxentry");
if (movie->entries != NULL) {
memcpy (temp, movie->entries, movie->index_entries *
(movie->header->Streams+1)
- * sizeof(AviIndexEntry));
+ * sizeof(AviIndexEntry));
MEM_freeN (movie->entries);
}
Modified: trunk/blender/source/blender/avi/intern/codecs.c
===================================================================
--- trunk/blender/source/blender/avi/intern/codecs.c 2010-03-22 08:49:12 UTC
(rev 27654)
+++ trunk/blender/source/blender/avi/intern/codecs.c 2010-03-22 09:30:00 UTC
(rev 27655)
@@ -44,41 +44,41 @@
void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat
from, AviFormat to, int *size) {
if (from == to)
- return buffer;
+ return buffer;
if (from != AVI_FORMAT_RGB24 &&
- to != AVI_FORMAT_RGB24)
- return avi_format_convert(movie, stream,
- avi_format_convert (movie, stream, buffer, from,
AVI_FORMAT_RGB24, size),
- AVI_FORMAT_RGB24, to, size);
+ to != AVI_FORMAT_RGB24)
+ return avi_format_convert(movie, stream,
+ avi_format_convert (movie, stream, buffer,
from, AVI_FORMAT_RGB24, size),
+ AVI_FORMAT_RGB24, to, size);
switch (to) {
case AVI_FORMAT_RGB24:
- switch (from) {
- case AVI_FORMAT_AVI_RGB:
- buffer = avi_converter_from_avi_rgb (movie, stream, buffer, size);
- break;
- case AVI_FORMAT_MJPEG:
- buffer = avi_converter_from_mjpeg (movie, stream, buffer, size);
- break;
- case AVI_FORMAT_RGB32:
- buffer = avi_converter_from_rgb32 (movie, stream, buffer, size);
- break;
- default:
- break;
- }
- break;
+ switch (from) {
+ case AVI_FORMAT_AVI_RGB:
+ buffer = avi_converter_from_avi_rgb (movie, stream, buffer, size);
+ break;
+ case AVI_FORMAT_MJPEG:
+ buffer = avi_converter_from_mjpeg (movie, stream, buffer, size);
+ break;
+ case AVI_FORMAT_RGB32:
+ buffer = avi_converter_from_rgb32 (movie, stream, buffer, size);
+ break;
+ default:
+ break;
+ }
+ break;
case AVI_FORMAT_AVI_RGB:
- buffer = avi_converter_to_avi_rgb (movie, stream, buffer, size);
- break;
+ buffer = avi_converter_to_avi_rgb (movie, stream, buffer, size);
+ break;
case AVI_FORMAT_MJPEG:
- buffer = avi_converter_to_mjpeg (movie, stream, buffer, size);
- break;
+ buffer = avi_converter_to_mjpeg (movie, stream, buffer, size);
+ break;
case AVI_FORMAT_RGB32:
- buffer = avi_converter_to_rgb32 (movie, stream, buffer, size);
- break;
+ buffer = avi_converter_to_rgb32 (movie, stream, buffer, size);
+ break;
default:
- break;
+ break;
}
return buffer;
@@ -88,11 +88,11 @@
char fcc[5];
if (avi_get_format_type (format) == FCC("vids"))
- sprintf (fcc,"%2.2ddc",stream);
+ sprintf (fcc,"%2.2ddc",stream);
else if (avi_get_format_type (format) == FCC("auds"))
- sprintf (fcc,"%2.2ddc",stream);
+ sprintf (fcc,"%2.2ddc",stream);
else
- return 0;
+ return 0;
return FCC(fcc);
}
@@ -103,11 +103,11 @@
case AVI_FORMAT_RGB32:
case AVI_FORMAT_AVI_RGB:
case AVI_FORMAT_MJPEG:
- return FCC("vids");
- break;
+ return FCC("vids");
+ break;
default:
- return 0;
- break;
+ return 0;
+ break;
}
}
@@ -116,14 +116,14 @@
case AVI_FORMAT_RGB24:
case AVI_FORMAT_RGB32:
case AVI_FORMAT_AVI_RGB:
- return FCC("DIB ");
- break;
+ return FCC("DIB ");
+ break;
case AVI_FORMAT_MJPEG:
- return FCC("MJPG");
- break;
+ return FCC("MJPG");
+ break;
default:
- return 0;
- break;
+ return 0;
+ break;
}
}
@@ -132,13 +132,13 @@
case AVI_FORMAT_RGB24:
case AVI_FORMAT_RGB32:
case AVI_FORMAT_AVI_RGB:
- return 0;
- break;
+ return 0;
+ break;
case AVI_FORMAT_MJPEG:
- return FCC("MJPG");
- break;
+ return FCC("MJPG");
+ break;
default:
- return 0;
- break;
+ return 0;
+ break;
}
}
Modified: trunk/blender/source/blender/avi/intern/mjpeg.c
===================================================================
--- trunk/blender/source/blender/avi/intern/mjpeg.c 2010-03-22 08:49:12 UTC
(rev 27654)
+++ trunk/blender/source/blender/avi/intern/mjpeg.c 2010-03-22 09:30:00 UTC
(rev 27655)
@@ -134,13 +134,13 @@
0xf9, 0xfa };
add_huff_table(dinfo, &dinfo->dc_huff_tbl_ptrs[0],
- bits_dc_luminance, val_dc_luminance);
+ bits_dc_luminance, val_dc_luminance);
add_huff_table(dinfo, &dinfo->ac_huff_tbl_ptrs[0],
- bits_ac_luminance, val_ac_luminance);
+ bits_ac_luminance, val_ac_luminance);
add_huff_table(dinfo, &dinfo->dc_huff_tbl_ptrs[1],
- bits_dc_chrominance, val_dc_chrominance);
+ bits_dc_chrominance, val_dc_chrominance);
add_huff_table(dinfo, &dinfo->ac_huff_tbl_ptrs[1],
- bits_ac_chrominance, val_ac_chrominance);
+ bits_ac_chrominance, val_ac_chrominance);
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
