Mercurial > mplayer.hg
changeset 21730:f095f11b5be4
Properly fix compilation without code duplication.
| author | diego |
|---|---|
| date | Sat, 23 Dec 2006 22:35:46 +0000 |
| parents | 109590481689 |
| children | 61c0bae18c23 |
| files | libmpcodecs/vf_zrmjpeg.c |
| diffstat | 1 files changed, 2 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vf_zrmjpeg.c Sat Dec 23 20:12:49 2006 +0000 +++ b/libmpcodecs/vf_zrmjpeg.c Sat Dec 23 22:35:46 2006 +0000 @@ -39,13 +39,6 @@ #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 @@ -322,7 +315,7 @@ * macroblocks and it outputs the huffman code for 'no change' (dc) and * 'all zero' (ac)) and it takes 4 macroblocks (422) instead of 6 (420) */ -static always_inline void zr_mjpeg_encode_mb(jpeg_enc_t *j) { +static av_always_inline void zr_mjpeg_encode_mb(jpeg_enc_t *j) { MJpegContext *m = j->s->mjpeg_ctx; @@ -361,7 +354,7 @@ * \param u_data pointer to the U plane * \param v_data pointer to the V plane */ -static always_inline void fill_block(jpeg_enc_t *j, int x, int y, +static av_always_inline void fill_block(jpeg_enc_t *j, int x, int y, unsigned char *y_data, unsigned char *u_data, unsigned char *v_data) {