diff options
author | Thomas Dinges <blender@dingto.org> | 2012-08-03 01:50:49 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2012-08-03 01:50:49 +0400 |
commit | fa048322473709a658f229d7b8b4ff673cd2a545 (patch) | |
tree | 12b7ad00a2311538bf1378e442d87faf98ee54ce | |
parent | 5e60ccc65c09f9b2e344ecfd9584611839ecdff6 (diff) |
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.
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeavi.c | 7 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
4 files changed, 2 insertions, 15 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 02fc5a9a62e..21b335aa1e9 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -969,7 +969,6 @@ int BKE_imtype_is_movie(const char imtype) 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 @@ char BKE_imtype_from_arg(const char *imtype_arg) 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 @@ int BKE_add_image_extension(char *string, const char imtype) 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"; } diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index cd19f8a987c..dab44b5463c 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -80,13 +80,6 @@ bMovieHandle *BKE_movie_handle_get(const char imtype) 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; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 02a7d0da325..76ce907a8e1 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -288,7 +288,7 @@ typedef struct ImageFormatData { #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 diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 7148958943b..9b91729b5d7 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -238,10 +238,6 @@ EnumPropertyItem image_type_items[] = { 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 |