resolved conflict state with HEAD r14096
[blender.git] / source / blender / avi / intern / avi.c
2008-03-13 Jean-Luc Peurièreresolved conflict state with HEAD r14096
2008-02-04 Hamed Zaghaghimerging game_engine branch changes into trunk, 2d-filte...
2008-02-03 Ken HughesMore fixes for gcc warnings.
2007-12-25 Joseph Eagar=Scons ffmpeg update and avi fix=
2007-11-06 Martin PoirierFilling in branch from trunk
2007-02-13 Kent MeinThis fixes a bug in the mplayer bug tracker ;)
2006-06-06 Kent MeinMade it so avi code handles "dropped frames"
2005-03-23 Kent Meina fix for: https://projects.blender.org/tracker/index...
2002-11-25 Kent Meinupdated .c files to include:
2002-10-12 Hans LambermontInitial revision v2.25