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

[Peter Schlaile]

Revision: 14809
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14809
Author:   schlaile
Date:     2008-05-12 11:01:15 +0200 (Mon, 12 May 2008)

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

Added (disabled) MKV support. Might come handy later, if someone finds
out, why it instantly crashes after 2 frames.

Made it impossible to set min_rate higher than max_rate in render buttons
panel.

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-05-12 
07:32:46 UTC (rev 14808)
+++ trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h   2008-05-12 
09:01:15 UTC (rev 14809)
@@ -43,6 +43,7 @@
 #define FFMPEG_H264     6
 #define FFMPEG_XVID     7
 #define FFMPEG_FLV      8
+#define FFMPEG_MKV      9
 
 #define FFMPEG_CODEC_MPEG1 0
 #define FFMPEG_CODEC_MPEG2 1

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c        
2008-05-12 07:32:46 UTC (rev 14808)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c        
2008-05-12 09:01:15 UTC (rev 14809)
@@ -226,6 +226,10 @@
                static const char * rv[] = { ".flv", NULL };
                return rv;
        }
+       case FFMPEG_MKV: {
+               static const char * rv[] = { ".mkv", NULL };
+               return rv;
+       }
        default:
                return NULL;
        }

Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c    2008-05-12 07:32:46 UTC 
(rev 14808)
+++ trunk/blender/source/blender/src/buttons_scene.c    2008-05-12 09:01:15 UTC 
(rev 14809)
@@ -2789,8 +2789,10 @@
                          &G.scene->r.ffcodecdata.video_bitrate, 
                          1, 14000, 0, 0, "Video bitrate(kb/s)");
        uiDefButI(block, NUM, B_DIFF, "Min Rate", 
-                         xcol1, yofs+22, 110, 20, 
&G.scene->r.ffcodecdata.rc_min_rate, 
-                         0, 14000, 0, 0, "Rate control: min rate(kb/s)");
+                 xcol1, yofs+22, 110, 20, 
+                 &G.scene->r.ffcodecdata.rc_min_rate, 
+                 0, G.scene->r.ffcodecdata.rc_max_rate, 
+                 0, 0, "Rate control: min rate(kb/s)");
        uiDefButI(block, NUM, B_DIFF, "Max Rate", 
                          xcol1, yofs, 110, 20, 
&G.scene->r.ffcodecdata.rc_max_rate, 
                          1, 14000, 0, 0, "Rate control: max rate(kb/s)");
@@ -2823,7 +2825,8 @@
                                 0, 1, 0,0, "Autosplit output at 2GB 
boundary.");
        
        
-       if (ELEM(G.scene->r.ffcodecdata.type, FFMPEG_AVI, FFMPEG_MOV)) {
+       if (ELEM3(G.scene->r.ffcodecdata.type, FFMPEG_AVI, 
+                 FFMPEG_MOV, FFMPEG_MKV)) {
                uiDefBut(block, LABEL, 0, "Codec", 
                                xcol1, yofs-44, 110, 20, 0, 0, 0, 0, 0, "");
                uiDefButI(block, MENU,B_REDR, ffmpeg_codec_pup(), 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs