diff options
| author | Matt Ebb <matt@mke3.net> | 2010-03-13 03:17:52 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-03-13 03:17:52 +0300 |
| commit | 25a14bad610604040a66ec6f8938069ab77b642d (patch) | |
| tree | 3d3af454e9b589c75a507a3a89ba5c466d7a0086 /source/blender/makesrna/intern | |
| parent | a4de5e06af1de4d06400a3ef97627b1eb60f8dc5 (diff) | |
Fix [#21351] PROPERTIES: Resolution changes based solely on changing
encoding format
Bypassed existing hardcoded ffmpeg presets that executed when changing
format, replaced with bpy presets.
Leaving old code there for now, haven't got python/rna access to the ffmpeg
id properties.. Anyone know how to do this?
Code snippets here: http://www.pasteall.org/11657/c
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 9872d6e1801..5139a06aba5 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -132,7 +132,7 @@ EnumPropertyItem image_type_items[] = { {R_H264, "H264", ICON_FILE_MOVIE, "H.264", ""}, {R_XVID, "XVID", ICON_FILE_MOVIE, "Xvid", ""}, {R_THEORA, "THEORA", ICON_FILE_MOVIE, "Ogg Theora", ""}, - {R_FFMPEG, "FFMPEG", ICON_FILE_MOVIE, "FFMpeg", ""}, + {R_FFMPEG, "FFMPEG", ICON_FILE_MOVIE, "MPEG", ""}, #endif {R_FRAMESERVER, "FRAMESERVER", ICON_FILE_SCRIPT, "Frame Server", ""}, {0, NULL, 0, NULL, NULL}}; |