diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_writeffmpeg.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 7 | ||||
| -rw-r--r-- | source/blender/src/buttons_scene.c | 10 |
3 files changed, 15 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h index 13084e925e0..6e60f9d08b3 100644 --- a/source/blender/blenkernel/BKE_writeffmpeg.h +++ b/source/blender/blenkernel/BKE_writeffmpeg.h @@ -45,6 +45,7 @@ extern "C" { #define FFMPEG_DV 5 #define FFMPEG_H264 6 #define FFMPEG_XVID 7 +#define FFMPEG_FLV 8 #define FFMPEG_CODEC_MPEG1 0 #define FFMPEG_CODEC_MPEG2 1 @@ -53,6 +54,7 @@ extern "C" { #define FFMPEG_CODEC_DV 4 #define FFMPEG_CODEC_H264 5 #define FFMPEG_CODEC_XVID 6 +#define FFMPEG_CODEC_FLV1 7 #define FFMPEG_PRESET_NONE 0 #define FFMPEG_PRESET_DVD 1 diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index e4b9940d135..e645cbb97f4 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -220,6 +220,10 @@ static const char** get_file_extensions(int format) static const char * rv[] = { ".avi", NULL }; return rv; } + case FFMPEG_FLV: { + static const char * rv[] = { ".flv", NULL }; + return rv; + } default: return NULL; } @@ -599,6 +603,9 @@ void start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty) case FFMPEG_XVID: fmt->video_codec = CODEC_ID_XVID; break; + case FFMPEG_FLV: + fmt->video_codec = CODEC_ID_FLV1; + break; case FFMPEG_MPEG4: default: fmt->video_codec = CODEC_ID_MPEG4; 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; } |