[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14413] trunk/blender/source/blender: == FFMPEG ==

[Peter Schlaile]

Revision: 14413
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14413
Author:   schlaile
Date:     2008-04-13 20:50:16 +0200 (Sun, 13 Apr 2008)

Log Message:
-----------
== FFMPEG ==

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

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
    trunk/blender/source/blender/src/buttons_scene.c

Modified: trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h	2008-04-13 17:45:56 UTC (rev 14412)
+++ trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h	2008-04-13 18:50:16 UTC (rev 14413)
@@ -45,6 +45,7 @@
 #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 @@
 #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

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2008-04-13 17:45:56 UTC (rev 14412)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2008-04-13 18:50:16 UTC (rev 14413)
@@ -220,6 +220,10 @@
 		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 @@
 	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;

Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c	2008-04-13 17:45:56 UTC (rev 14412)
+++ trunk/blender/source/blender/src/buttons_scene.c	2008-04-13 18:50:16 UTC (rev 14413)
@@ -1798,7 +1798,7 @@
        }
        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 @@
                "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_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 @@
                "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;
 
 }