griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Some options used for "expert" x264 setup were removed from FFmpeg 0.11

Browse Source 
Prevent crashes in cases when option can't be found.
This commit is contained in:
Sergey Sharybin
2012-06-18 15:42:23 +00:00
parent bdfcc5c619
commit 4b877e1f8b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/writeffmpeg.c
View File

@@ -1206,7 +1206,7 @@ int BKE_ffmpeg_property_add_string(RenderData *rd, const char *type, const char
char name_[128];
char *name;
char *param;
IDProperty *prop;
IDProperty *prop = NULL;
avcodec_get_context_defaults(&c);
@@ -1234,9 +1234,11 @@ int BKE_ffmpeg_property_add_string(RenderData *rd, const char *type, const char
}
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,