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:
authorCampbell Barton <ideasman42@gmail.com>2010-10-20 16:33:00 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-10-20 16:33:00 +0400
commita9f79ee5360261d00c72ed9528052fa3791d17f5 (patch)
tree7e2d882e95ec29547804a7986488ba3aad324dd9 /source/blender/avi
parent394caf98e3ae78fec83b8e36b6f3deb342efe3af (diff)
Quiet compiler warnings.
Diffstat (limited to 'source/blender/avi')
-rw-r--r--source/blender/avi/intern/avi.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c
index 5f0d36e17e2..53be1b4467a 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/avi/intern/avi.c
@@ -48,7 +48,7 @@
static int AVI_DEBUG=0;
static char DEBUG_FCC[4];
-#define DEBUG(x) if(AVI_DEBUG) printf("AVI DEBUG: " x);
+#define DEBUG_PRINT(x) if(AVI_DEBUG) printf("AVI DEBUG: " x);
/* local functions */
char *fcc_to_char (unsigned int fcc);
@@ -218,7 +218,7 @@ int AVI_is_avi (char *name) {
AviBitmapInfoHeader bheader;
int movie_tracks = 0;
- DEBUG("opening movie\n");
+ DEBUG_PRINT("opening movie\n");
memset(&movie, 0, sizeof(AviMovie));
@@ -243,7 +243,7 @@ int AVI_is_avi (char *name) {
GET_FCC (movie.fp) != FCC("hdrl") ||
(movie.header->fcc = GET_FCC (movie.fp)) != FCC("avih") ||
!(movie.header->size = GET_FCC (movie.fp))) {
- DEBUG("bad initial header info\n");
+ DEBUG_PRINT("bad initial header info\n");
fclose(movie.fp);
return 0;
}
@@ -266,7 +266,7 @@ int AVI_is_avi (char *name) {
fseek (movie.fp, movie.header->size-14*4, SEEK_CUR);
if (movie.header->Streams < 1) {
- DEBUG("streams less than 1\n");
+ DEBUG_PRINT("streams less than 1\n");
fclose(movie.fp);
return 0;
}
@@ -280,7 +280,7 @@ int AVI_is_avi (char *name) {
GET_FCC (movie.fp) != FCC ("strl") ||
(movie.streams[temp].sh.fcc = GET_FCC (movie.fp)) != FCC ("strh") ||
!(movie.streams[temp].sh.size = GET_FCC (movie.fp))) {
- DEBUG("bad stream header information\n");
+ DEBUG_PRINT("bad stream header information\n");
MEM_freeN(movie.streams);
fclose(movie.fp);
@@ -328,7 +328,7 @@ int AVI_is_avi (char *name) {
fseek (movie.fp, movie.streams[temp].sh.size-14*4, SEEK_CUR);
if (GET_FCC (movie.fp) != FCC("strf")) {
- DEBUG("no stream format information\n");
+ DEBUG_PRINT("no stream format information\n");
MEM_freeN(movie.streams);
fclose(movie.fp);
return 0;
@@ -384,7 +384,7 @@ int AVI_is_avi (char *name) {
while (GET_FCC (movie.fp) != FCC("LIST")) {
temp= GET_FCC (movie.fp);
if (temp<0 || ftell(movie.fp) > movie.size) {
- DEBUG("incorrect size in header or error in AVI\n");
+ DEBUG_PRINT("incorrect size in header or error in AVI\n");
MEM_freeN(movie.streams);
fclose(movie.fp);
@@ -407,7 +407,7 @@ int AVI_is_avi (char *name) {
AviError AVI_open_movie (char *name, AviMovie *movie) {
int temp, fcca, size, j;
- DEBUG("opening movie\n");
+ DEBUG_PRINT("opening movie\n");
memset(movie, 0, sizeof(AviMovie));
@@ -430,7 +430,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) {
GET_FCC (movie->fp) != FCC("hdrl") ||
(movie->header->fcc = GET_FCC (movie->fp)) != FCC("avih") ||
!(movie->header->size = GET_FCC (movie->fp))) {
- DEBUG("bad initial header info\n");
+ DEBUG_PRINT("bad initial header info\n");
return AVI_ERROR_FORMAT;
}
@@ -452,7 +452,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) {
fseek (movie->fp, movie->header->size-14*4, SEEK_CUR);
if (movie->header->Streams < 1) {
- DEBUG("streams less than 1\n");
+ DEBUG_PRINT("streams less than 1\n");
return AVI_ERROR_FORMAT;
}
@@ -465,7 +465,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) {
GET_FCC (movie->fp) != FCC ("strl") ||
(movie->streams[temp].sh.fcc = GET_FCC (movie->fp)) != FCC ("strh") ||
!(movie->streams[temp].sh.size = GET_FCC (movie->fp))) {
- DEBUG("bad stream header information\n");
+ DEBUG_PRINT("bad stream header information\n");
return AVI_ERROR_FORMAT;
}
@@ -507,7 +507,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) {
fseek (movie->fp, movie->streams[temp].sh.size-14*4, SEEK_CUR);
if (GET_FCC (movie->fp) != FCC("strf")) {
- DEBUG("no stream format information\n");
+ DEBUG_PRINT("no stream format information\n");
return AVI_ERROR_FORMAT;
}
@@ -560,7 +560,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) {
while (GET_FCC (movie->fp) != FCC("LIST")) {
temp= GET_FCC (movie->fp);
if (temp<0 || ftell(movie->fp) > movie->size) {
- DEBUG("incorrect size in header or error in AVI\n");
+ DEBUG_PRINT("incorrect size in header or error in AVI\n");
return AVI_ERROR_FORMAT;
}
fseek(movie->fp, temp, SEEK_CUR);
@@ -585,7 +585,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) {
fseek (movie->fp, size, SEEK_CUR);
}
if (ftell(movie->fp) > movie->size) {
- DEBUG("incorrect size in header or error in AVI\n");
+ DEBUG_PRINT("incorrect size in header or error in AVI\n");
return AVI_ERROR_FORMAT;
}
}
@@ -599,13 +599,13 @@ AviError AVI_open_movie (char *name, AviMovie *movie) {
fseek(movie->fp, size-4, SEEK_CUR);
if (GET_FCC(movie->fp) != FCC("idx1")) {
- DEBUG("bad index informatio\n");
+ DEBUG_PRINT("bad index informatio\n");
return AVI_ERROR_FORMAT;
}
movie->index_entries = GET_FCC (movie->fp)/sizeof(AviIndexEntry);
if (movie->index_entries == 0) {
- DEBUG("no index entries\n");
+ DEBUG_PRINT("no index entries\n");
return AVI_ERROR_FORMAT;
}
@@ -631,7 +631,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) {
movie->read_offset= 4;
}
- DEBUG("movie succesfully opened\n");
+ DEBUG_PRINT("movie succesfully opened\n");
return AVI_ERROR_NONE;
}