RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Properly fix compilation without code duplication. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21746 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-12-23 22:35:46 +00:00
parent 2ed157ccfc
commit 2240156c34
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libmpcodecs/vf_zrmjpeg.c
View File

@ -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)
{