Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-10-24 14:26:37 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-10-24 14:26:37 +0400
commit5a6605610dbdc78515343bae048fa3d10b23533c (patch)
treedd9b4fefffc9abc6c78a0f8ab0a70993fa0dde0d /source/blender/blenkernel/intern/writeffmpeg.c
parenta1af5ae6a69704eb147bc05f29374e894b9d0326 (diff)
Fix #28949: can't render video to Flash
Several issues were discovered when was looking into this bug: - MPEG file format didn't set needed codec settings such as frame rate and so, Was caused by not very correct fix fix #21351. - "Expert" codec settings stored in idprops was affected on formats which don't actually need them causing some conflicts in codec settings. - Flash codec doesn't support b-frames. Now C presets shouldn't affect on each other and flash coded wouldn't use b-frames even when using h264 format. Should work fine for files created from scratch. If existing files fails to render, try to switch file format to something else and then back to needed value.
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
-rw-r--r--source/blender/blenkernel/intern/writeffmpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index da1412dac0d..bdca3c8e618 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -1102,7 +1102,7 @@ IDProperty *ffmpeg_property_add(RenderData *rd, char * type, int opt_index, int
idp_type = IDP_FLOAT;
break;
case FF_OPT_TYPE_STRING:
- val.str = (char *)" ";
+ val.str = " ";
idp_type = IDP_STRING;
break;
case FF_OPT_TYPE_CONST:
@@ -1377,3 +1377,4 @@ void ffmpeg_verify_image_type(RenderData *rd)
}
#endif
+