Revision: 49515
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49515
Author: dingto
Date: 2012-08-02 21:50:49 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
Code cleanup:
* Removed some remaining defines for AVI_CODEC (from the old 2.4x days and
windows only), because only some defines were left, no underlying code to bring
back, so just as good remove for good.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/writeavi.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2012-08-02
21:36:33 UTC (rev 49514)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2012-08-02
21:50:49 UTC (rev 49515)
@@ -969,7 +969,6 @@
switch (imtype) {
case R_IMF_IMTYPE_AVIRAW:
case R_IMF_IMTYPE_AVIJPEG:
- case R_IMF_IMTYPE_AVICODEC:
case R_IMF_IMTYPE_QUICKTIME:
case R_IMF_IMTYPE_FFMPEG:
case R_IMF_IMTYPE_H264:
@@ -1084,7 +1083,6 @@
else if (!strcmp(imtype_arg, "AVIRAW")) return R_IMF_IMTYPE_AVIRAW;
else if (!strcmp(imtype_arg, "AVIJPEG")) return R_IMF_IMTYPE_AVIJPEG;
else if (!strcmp(imtype_arg, "PNG")) return R_IMF_IMTYPE_PNG;
- else if (!strcmp(imtype_arg, "AVICODEC")) return R_IMF_IMTYPE_AVICODEC;
else if (!strcmp(imtype_arg, "QUICKTIME")) return
R_IMF_IMTYPE_QUICKTIME;
else if (!strcmp(imtype_arg, "BMP")) return R_IMF_IMTYPE_BMP;
#ifdef WITH_HDR
@@ -1180,7 +1178,7 @@
extension = ".jp2";
}
#endif
- else { // R_IMF_IMTYPE_AVICODEC, R_IMF_IMTYPE_AVIRAW,
R_IMF_IMTYPE_AVIJPEG, R_IMF_IMTYPE_JPEG90, R_IMF_IMTYPE_QUICKTIME etc
+ else { // R_IMF_IMTYPE_AVIRAW, R_IMF_IMTYPE_AVIJPEG,
R_IMF_IMTYPE_JPEG90, R_IMF_IMTYPE_QUICKTIME etc
if (!(BLI_testextensie(string, ".jpg") ||
BLI_testextensie(string, ".jpeg")))
extension = ".jpg";
}
Modified: trunk/blender/source/blender/blenkernel/intern/writeavi.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeavi.c 2012-08-02
21:36:33 UTC (rev 49514)
+++ trunk/blender/source/blender/blenkernel/intern/writeavi.c 2012-08-02
21:50:49 UTC (rev 49515)
@@ -80,13 +80,6 @@
mh.get_movie_path = filepath_avi;
/* do the platform specific handles */
-#if defined(_WIN32) && !defined(FREE_WINDOWS)
- if (imtype == R_IMF_IMTYPE_AVICODEC) {
- //XXX mh.start_movie= start_avi_codec;
- //XXX mh.append_movie= append_avi_codec;
- //XXX mh.end_movie= end_avi_codec;
- }
-#endif
#ifdef WITH_QUICKTIME
if (imtype == R_IMF_IMTYPE_QUICKTIME) {
mh.start_movie = start_qt;
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2012-08-02
21:36:33 UTC (rev 49514)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2012-08-02
21:50:49 UTC (rev 49515)
@@ -288,7 +288,7 @@
#define R_IMF_IMTYPE_AVIRAW 15
#define R_IMF_IMTYPE_AVIJPEG 16
#define R_IMF_IMTYPE_PNG 17
-#define R_IMF_IMTYPE_AVICODEC 18
+/* #define R_IMF_IMTYPE_AVICODEC 18 */ /* avicodec is nomore /*
#define R_IMF_IMTYPE_QUICKTIME 19
#define R_IMF_IMTYPE_BMP 20
#define R_IMF_IMTYPE_RADHDR 21
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-08-02
21:36:33 UTC (rev 49514)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-08-02
21:50:49 UTC (rev 49515)
@@ -238,10 +238,6 @@
IMAGE_TYPE_ITEMS_IMAGE_ONLY
{0, "", 0, N_("Movie"), NULL},
-#ifdef _WIN32
- /* XXX Missing codec menu */
- {R_IMF_IMTYPE_AVICODEC, "AVICODEC", ICON_FILE_MOVIE, "AVI Codec",
"Output video in AVI format"},
-#endif
{R_IMF_IMTYPE_AVIJPEG, "AVI_JPEG", ICON_FILE_MOVIE, "AVI JPEG", "Output
video in AVI JPEG format"},
{R_IMF_IMTYPE_AVIRAW, "AVI_RAW", ICON_FILE_MOVIE, "AVI Raw", "Output
video in AVI Raw format"},
#ifdef WITH_FRAMESERVER
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
