diff options
Diffstat (limited to 'src')
| -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]; |