diff options
| -rw-r--r-- | libmpcodecs/vf_zrmjpeg.c | 9 | ||||
| -rw-r--r-- | libvo/jpeg_enc.c | 2 |
2 files changed, 9 insertions, 2 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) diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c index bdb9748656..754a3eb05c 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -113,7 +113,7 @@ static void convert_matrix(MpegEncContext *s, int (*qmat)[64], 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_SHIFT_MMX) / (qscale * quant_matrix[j])); + qmat [qscale][i] = (int)((UINT64_C(1) << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j])); qmat16[qscale][0][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j]); if(qmat16[qscale][0][i]==0 || qmat16[qscale][0][i]==128*256) qmat16[qscale][0][i]=128*256-1; |