Revision: 41647
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41647
Author: nazgul
Date: 2011-11-08 10:17:50 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
- Fixed typo in KLT description tooltip
- Fixed inconsistent data type used for pts number in ffmpeg_fetchibuf
and stored in timecode structure. Not really issue for "correct" movie files,
but probably can help for "broken" one
Modified Paths:
--------------
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
Modified: trunk/blender/source/blender/imbuf/intern/anim_movie.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim_movie.c 2011-11-08
09:34:43 UTC (rev 41646)
+++ trunk/blender/source/blender/imbuf/intern/anim_movie.c 2011-11-08
10:17:50 UTC (rev 41647)
@@ -890,7 +890,7 @@
static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position,
IMB_Timecode_Type tc) {
- int64_t pts_to_search = 0;
+ unsigned long long pts_to_search = 0;
double frame_rate;
double pts_time_base;
long long st_time;
Modified: trunk/blender/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_tracking.c 2011-11-08
09:34:43 UTC (rev 41646)
+++ trunk/blender/source/blender/makesrna/intern/rna_tracking.c 2011-11-08
10:17:50 UTC (rev 41647)
@@ -418,7 +418,7 @@
static EnumPropertyItem tracker_items[] = {
{TRACKER_SAD, "SAD", 0, "SAD", "Sum of Absolute Differences
tracker"},
- {TRACKER_KLT, "KLT", 0, "KLT", "Kanade–Lucas–Tomasi racker"},
+ {TRACKER_KLT, "KLT", 0, "KLT", "Kanade–Lucas–Tomasi tracker"},
{0, NULL, 0, NULL, NULL}};
rna_def_trackingMarker(brna);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
