[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48042] trunk/blender/source/blender/ blenkernel/intern/writeffmpeg.c: Some options used for "expert" x264 setup were removed from FFmpeg 0.11

[Sergey Sharybin]

Revision: 48042
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48042
Author:   nazgul
Date:     2012-06-18 15:42:23 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Some options used for "expert" x264 setup were removed from FFmpeg 0.11
Prevent crashes in cases when option can't be found.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c        
2012-06-18 14:44:16 UTC (rev 48041)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c        
2012-06-18 15:42:23 UTC (rev 48042)
@@ -1206,7 +1206,7 @@
        char name_[128];
        char *name;
        char *param;
-       IDProperty *prop;
+       IDProperty *prop = NULL;
        
        avcodec_get_context_defaults(&c);
 
@@ -1234,9 +1234,11 @@
        }
        if (param && o->type != FF_OPT_TYPE_CONST && o->unit) {
                p = my_av_find_opt(&c, param, o->unit, 0, 0);   
-               prop = BKE_ffmpeg_property_add(rd,
-                                              (char *) type, p - 
c.av_class->option,
-                                              o - c.av_class->option);
+               if (p) {
+                       prop = BKE_ffmpeg_property_add(rd,
+                                                      (char *) type, p - 
c.av_class->option,
+                                                      o - c.av_class->option);
+               }
        }
        else {
                prop = BKE_ffmpeg_property_add(rd,

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs