== FFMPEG ==

Added flash video menu entries. (Encoder was compiled in anyways)

2 files changed, 9 insertions, 0 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;