diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-23 22:35:46 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-23 22:35:46 +0000 |
| commit | 2240156c3480d3425825599982207b6afea7e7e9 (patch) | |
| tree | 9b8146fd5a06ab6a371673edeb6b155cdecf6581 /libmpcodecs | |
| parent | 2ed157ccfcd85a1abddac88c1f1a05e64260e454 (diff) | |
| download | mpv-2240156c3480d3425825599982207b6afea7e7e9.tar.bz2 mpv-2240156c3480d3425825599982207b6afea7e7e9.tar.xz | |
Properly fix compilation without code duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21746 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_zrmjpeg.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index 64a8707480..077d6394b0 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -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 @@ typedef struct { * 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 @@ static always_inline void zr_mjpeg_encode_mb(jpeg_enc_t *j) { * \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) { |