diff options
| author | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-23 13:18:43 +0000 |
|---|---|---|
| committer | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-23 13:18:43 +0000 |
| commit | cf122d037cc1e44f3318bb2216d7c25f573bf1c5 (patch) | |
| tree | d711ff5eaf92d2bd9b7ae2ea14c2f1732a4a4bbc /libmpcodecs | |
| parent | 7c44ff04838a88d260e83fcf181f26c591ce2447 (diff) | |
| download | mpv-cf122d037cc1e44f3318bb2216d7c25f573bf1c5.tar.bz2 mpv-cf122d037cc1e44f3318bb2216d7c25f573bf1c5.tar.xz | |
compilation fixes: define always_inline and don't use uint64_t_C
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21740 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_zrmjpeg.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index 67f882df54..64a8707480 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -39,6 +39,13 @@ #include "libavcodec/mpegvideo.h" //#include "jpeg_enc.h" /* this file is not present yet */ +/* code from ffmpeg/libavcodec */ +#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0) +# define always_inline __attribute__((always_inline)) inline +#else +# define always_inline inline +#endif + #undef malloc #undef free #undef realloc @@ -151,7 +158,7 @@ static void convert_matrix(MpegEncContext *s, int (*qmat)[64], * So 16 <= qscale * quant_matrix[i] <= 7905 * so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 * so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67 */ - qmat[qscale][i] = (int)((uint64_t_C(1) << + qmat[qscale][i] = (int)((UINT64_C(1) << QMAT_SHIFT_MMX) / (qscale *quant_matrix[j])); qmat16[qscale][0][i] = (1 << QMAT_SHIFT_MMX) |