diff options
| author | Juergen Keil <jkeil@users.sourceforge.net> | 2002-04-26 17:29:34 +0000 |
|---|---|---|
| committer | Juergen Keil <jkeil@users.sourceforge.net> | 2002-04-26 17:29:34 +0000 |
| commit | 5c51c07e4bd766085fd3ddbf8713cbf6d203e0db (patch) | |
| tree | 28fceea67ef7e7bb669391fc1785fd2720f27677 | |
| parent | 76f4bb793a3164de4d7554bf585714b0c272a109 (diff) | |
| download | xine-lib-5c51c07e4bd766085fd3ddbf8713cbf6d203e0db.tar.gz xine-lib-5c51c07e4bd766085fd3ddbf8713cbf6d203e0db.tar.bz2 | |
Some minor changes to make libavcodec compibale with Sun's Forte compiler
CVS patchset: 1778
CVS date: 2002/04/26 17:29:34
| -rw-r--r-- | src/libffmpeg/libavcodec/common.h | 4 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/h263.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h index 5cab8554b..53e123d48 100644 --- a/src/libffmpeg/libavcodec/common.h +++ b/src/libffmpeg/libavcodec/common.h @@ -148,7 +148,11 @@ inline void dprintf(const char* fmt,...) {} #else #ifdef DEBUG +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || !defined(__GNUC__) +#define dprintf(...) printf(__VA_ARGS__) +#else #define dprintf(fmt,args...) printf(fmt, ## args) +#endif #else #define dprintf(fmt,args...) #endif diff --git a/src/libffmpeg/libavcodec/h263.c b/src/libffmpeg/libavcodec/h263.c index 52127aaad..a8d04d58a 100644 --- a/src/libffmpeg/libavcodec/h263.c +++ b/src/libffmpeg/libavcodec/h263.c @@ -2210,7 +2210,7 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s) int a= 2<<s->sprite_warping_accuracy; int rho= 3-s->sprite_warping_accuracy; int r=16/a; - const int vop_ref[4][2]= {{0,0}, {s->width,0}, {0, s->height}, {s->width, s->height}}; // only true for rectangle shapes + int vop_ref[4][2]= {{0,0}, {s->width,0}, {0, s->height}, {s->width, s->height}}; // only true for rectangle shapes int d[4][2]={{0,0}, {0,0}, {0,0}, {0,0}}; int sprite_ref[4][2]; int virtual_ref[2][2]; |