[MPlayer-cvslog] r21740 - in trunk: libmpcodecs/vf_zrmjpeg.c libvo/jpeg_enc.c

[Diego Biurrun]

On Sat, Dec 23, 2006 at 02:18:43PM +0100, rik wrote:
> 
> Log:
> compilation fixes: define always_inline and don't use uint64_t_C
> 
> --- trunk/libmpcodecs/vf_zrmjpeg.c	(original)
> +++ trunk/libmpcodecs/vf_zrmjpeg.c	Sat Dec 23 14:18:43 2006
> @@ -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

Code duplication is not the correct solution.  av_always_inline should
be used instead.

Diego