Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <mail@jlucke.com>2018-10-17 13:43:41 +0300
committerJacques Lucke <mail@jlucke.com>2018-10-17 13:43:41 +0300
commit21744217cea9bb8f767f47cb6c41446563e645ac (patch)
tree4cd38ca5ae9530eb99fcf91fa28530b42d0fce68 /source/blender/avi
parentc6eb5651ba26db3fa26179f2124c58f8c94b5ca3 (diff)
Cleanup: remove some #if 0 blocks
Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D3802
Diffstat (limited to 'source/blender/avi')
-rw-r--r--source/blender/avi/intern/avi.c57
1 files changed, 0 insertions, 57 deletions
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c
index 6e798a6244e..94f409d2753 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/avi/intern/avi.c
@@ -200,35 +200,6 @@ AviError AVI_print_error(AviError in_error)
return in_error;
}
-#if 0
-void AVI_set_debug(int mode)
-{
- AVI_DEBUG = mode;
-}
-
-bool AVI_is_avi(char *name)
-{
- FILE *fp;
- int ret;
-
- fp = BLI_fopen(name, "rb");
- if (fp == NULL)
- return 0;
-
- if (GET_FCC(fp) != FCC("RIFF") ||
- !GET_FCC(fp) ||
- GET_FCC(fp) != FCC("AVI "))
- {
- ret = 0;
- }
- else {
- ret = 1;
- }
-
- fclose(fp);
- return ret;
-}
-#endif
bool AVI_is_avi(const char *name)
{
@@ -850,14 +821,6 @@ AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...)
movie->streams[i].sh.bottom = 0;
if (movie->streams[i].sh.Type == FCC("vids")) {
-#if 0
- if (movie->streams[i].format == AVI_FORMAT_MJPEG) {
- movie->streams[i].sf = MEM_mallocN(sizeof(AviBitmapInfoHeader) +
- sizeof(AviMJPEGUnknown), "moviestreamformatL");
- movie->streams[i].sf_size = sizeof(AviBitmapInfoHeader) + sizeof(AviMJPEGUnknown);
- }
- else {
-#endif
movie->streams[i].sf = MEM_mallocN(sizeof(AviBitmapInfoHeader), "moviestreamformatS");
movie->streams[i].sf_size = sizeof(AviBitmapInfoHeader);
@@ -874,26 +837,6 @@ AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...)
((AviBitmapInfoHeader *) movie->streams[i].sf)->YPelsPerMeter = 0;
((AviBitmapInfoHeader *) movie->streams[i].sf)->ClrUsed = 0;
((AviBitmapInfoHeader *) movie->streams[i].sf)->ClrImportant = 0;
-
-#if 0
- if (movie->streams[i].format == AVI_FORMAT_MJPEG) {
- AviMJPEGUnknown *tmp;
-
- tmp = (AviMJPEGUnknown *)((char *) movie->streams[i].sf + sizeof(AviBitmapInfoHeader));
-
- tmp->a = 44;
- tmp->b = 24;
- tmp->c = 0;
- tmp->d = 2;
- tmp->e = 8;
- tmp->f = 2;
- tmp->g = 1;
- }
- }
- else if (movie->streams[i].sh.Type == FCC("auds")) {
- /* pass */
- }
-#endif
}
}