[MPlayer-cvslog] r21746 - trunk/libmpcodecs/vf_zrmjpeg.c

[diego]

Author: diego
Date: Sat Dec 23 23:35:46 2006
New Revision: 21746

Modified:
   trunk/libmpcodecs/vf_zrmjpeg.c

Log:
Properly fix compilation without code duplication.


Modified: trunk/libmpcodecs/vf_zrmjpeg.c
==============================================================================
--- trunk/libmpcodecs/vf_zrmjpeg.c	(original)
+++ trunk/libmpcodecs/vf_zrmjpeg.c	Sat Dec 23 23:35:46 2006
@@ -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)
 {