diff options
| author | Peter Schlaile <peter@schlaile.de> | 2008-04-13 22:50:16 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2008-04-13 22:50:16 +0400 |
| commit | 4e40e6becce945930ed5aa6f6b7ee242b6b5e6b7 (patch) | |
| tree | 48c5d84d909fff6c6c30ddabe845c01c774c3516 /source/blender/src/buttons_scene.c | |
| parent | 4fc95e77b19cd25867e66f6c3e33f3f1528f6dbf (diff) | |
== FFMPEG ==
Added flash video menu entries. (Encoder was compiled in anyways)
Diffstat (limited to 'source/blender/src/buttons_scene.c')
| -rw-r--r-- | source/blender/src/buttons_scene.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index fde365adeaf..030efcd3e18 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -1798,7 +1798,7 @@ static char* ffmpeg_format_pup(void) } return string; #endif - strcpy(formatstring, "FFMpeg format: %%t|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d"); + strcpy(formatstring, "FFMpeg format: %%t|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d"); sprintf(string, formatstring, "MPEG-1", FFMPEG_MPEG1, "MPEG-2", FFMPEG_MPEG2, @@ -1807,7 +1807,8 @@ static char* ffmpeg_format_pup(void) "Quicktime", FFMPEG_MOV, "DV", FFMPEG_DV, "H264", FFMPEG_H264, - "XVid", FFMPEG_XVID); + "XVid", FFMPEG_XVID, + "FLV", FFMPEG_FLV); return string; } @@ -1830,7 +1831,7 @@ static char* ffmpeg_preset_pup(void) static char* ffmpeg_codec_pup(void) { static char string[2048]; char formatstring[2048]; - strcpy(formatstring, "FFMpeg format: %%t|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d"); + strcpy(formatstring, "FFMpeg format: %%t|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d"); sprintf(string, formatstring, "MPEG1", CODEC_ID_MPEG1VIDEO, "MPEG2", CODEC_ID_MPEG2VIDEO, @@ -1838,7 +1839,8 @@ static char* ffmpeg_codec_pup(void) { "HuffYUV", CODEC_ID_HUFFYUV, "DV", CODEC_ID_DVVIDEO, "H264", CODEC_ID_H264, - "XVid", CODEC_ID_XVID); + "XVid", CODEC_ID_XVID, + "FlashVideo1", CODEC_ID_FLV1 ); return string; } |